Minor corrections

This commit is contained in:
Riccardo Biraghi
2018-04-23 15:07:36 +01:00
parent c9e7ae194e
commit 1cba663922
2 changed files with 3 additions and 7 deletions

View File

@@ -15,11 +15,7 @@ cache:
env:
- DOCKER_DOWNGRADE="echo nothing to be done"
- DOCKER_DOWNGRADE="sudo apt-get autoremove -y docker-ce &
curl -fsSL https://apt.dockerproject.org/gpg | sudo apt-key add - &
sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" &
sudo apt-get update &
sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs)"
- DOCKER_DOWNGRADE="sudo apt-get autoremove -y docker-ce && curl -fsSL \"https://apt.dockerproject.org/gpg\" | sudo apt-key add - && sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" && sudo apt-get update && sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs)"
before_install:
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
@@ -38,7 +34,7 @@ script:
- make vet
- make build-devserver
- make build-devjmstest
- $DOCKER_DOWNGRADE
- eval "$DOCKER_DOWNGRADE"
- echo Running $(docker --version)
- make test-devserver