From dc910107cfc4cb5332ddaabd9d295e4c36e88c85 Mon Sep 17 00:00:00 2001 From: Steve Kamerman Date: Mon, 5 Dec 2016 09:21:39 -0500 Subject: [PATCH 1/3] Upgrade docker-engine and allow downgrades --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e850f08..ea2de37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,13 @@ services: env: global: - - DOCKER_VERSION=1.12.1-0~trusty + - DOCKER_VERSION=1.12.3-0~trusty before_install: # list docker-engine versions - apt-cache madison docker-engine # upgrade docker-engine to specific version - - sudo apt-get -o Dpkg::Options::="--force-confnew" install -y docker-engine=${DOCKER_VERSION} + - sudo apt-get -o Dpkg::Options::="--force-confnew" install -y --allow-downgrades docker-engine=${DOCKER_VERSION} - docker version - docker info - sudo add-apt-repository ppa:duggan/bats --yes From 271729aaaa201209f8a10395fcb7a7b9715d3f34 Mon Sep 17 00:00:00 2001 From: Steve Kamerman Date: Mon, 5 Dec 2016 09:29:08 -0500 Subject: [PATCH 2/3] Put --allow-downgrades in the right place --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea2de37..18ac9d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: # list docker-engine versions - apt-cache madison docker-engine # upgrade docker-engine to specific version - - sudo apt-get -o Dpkg::Options::="--force-confnew" install -y --allow-downgrades docker-engine=${DOCKER_VERSION} + - sudo apt-get -o Dpkg::Options::="--force-confnew" --allow-downgrades install -y docker-engine=${DOCKER_VERSION} - docker version - docker info - sudo add-apt-repository ppa:duggan/bats --yes From 59b88068596a40f5eb42a339c9a53064dbb6733d Mon Sep 17 00:00:00 2001 From: Steve Kamerman Date: Mon, 5 Dec 2016 09:33:44 -0500 Subject: [PATCH 3/3] Travis-CI's apt-get doesn't have --allow-downgrades yet, which is annoying because --force-yes is deprecated --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 18ac9d9..5386261 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: # list docker-engine versions - apt-cache madison docker-engine # upgrade docker-engine to specific version - - sudo apt-get -o Dpkg::Options::="--force-confnew" --allow-downgrades install -y docker-engine=${DOCKER_VERSION} + - sudo apt-get -o Dpkg::Options::="--force-confnew" install -y --force-yes docker-engine=${DOCKER_VERSION} - docker version - docker info - sudo add-apt-repository ppa:duggan/bats --yes