From 31489356995110e69df12038ffc73ff54ef31f17 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Tue, 2 May 2017 15:11:38 +0300 Subject: [PATCH] Inline docker-engine and docker-compose versions --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c334738f..6b3a6656 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,17 +12,15 @@ python: 3.5 env: - TOX_ENV=py34 - TOX_ENV=py35 - - DOCKER_ENGINE_VERSION=17.04.0~ce-0~ubuntu-precise # https://www.ubuntuupdates.org/?type=dists&vals=ubuntu-precise - - DOCKER_COMPOSE_VERSION=1.12.0 # https://github.com/docker/compose/releases/ before_install: - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-precise main" > /etc/apt/sources.list.d/docker.list' - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D - sudo apt-get update - sudo apt-key update - - sudo apt-get --force-yes -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=${DOCKER_ENGINE_VERSION} + - sudo apt-get --force-yes -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=17.04.0~ce-0~ubuntu-precise - sudo rm /usr/local/bin/docker-compose - - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - curl -L https://github.com/docker/compose/releases/download/1.12.0/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin - docker -v