From 7c9d24f869c70f0fc81a7bbb4ae5acea515d9d5d Mon Sep 17 00:00:00 2001 From: Jannis Gebauer Date: Thu, 11 Aug 2016 11:51:53 +0200 Subject: [PATCH] update docker installation on travis --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b548b923..cb6b5f8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,17 @@ env: - TOX_ENV=py35 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-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" docker-engine=1.10.1-0~trusty + - sudo apt-key update + - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=1.11.1-0~precise - sudo rm /usr/local/bin/docker-compose - - curl -L https://github.com/docker/compose/releases/download/1.6.0/docker-compose-`uname -s`-`uname -m` > docker-compose + - curl -L https://github.com/docker/compose/releases/download/1.7.0/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin + - docker-compose -v + - docker -v script: - tox -e $TOX_ENV