diff --git a/.travis.yml b/.travis.yml index 5fba74d0..33c49e14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,6 @@ services: env: matrix: - - DOCKER_VERSION=1.7.1-0~trusty - - DOCKER_VERSION=1.9.1-0~trusty - - DOCKER_VERSION=1.10.1-0~trusty - - DOCKER_VERSION=1.11.1-0~trusty - DOCKER_VERSION=17.03.0~ce-0~ubuntu-trusty python: @@ -19,11 +15,13 @@ python: before_install: - ./.validateDCO - - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=${DOCKER_VERSION} + - sudo apt-get install apt-transport-https ca-certificates curl gnupg-agent software-properties-common + - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + - sudo apt-key fingerprint 0EBFCD88 + - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + - sudo apt-get update + - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} - docker -v # might as well upgrade pip to support TLS and get rid of the warnings # sudo -H pip install --upgrade pip