From 2b48bfb3a39e08ca101c2907a99470832e63e435 Mon Sep 17 00:00:00 2001 From: Abhishek Chanda Date: Thu, 3 Mar 2016 18:11:51 -0800 Subject: [PATCH 1/2] Test against latest stable docker --- scripts/update_docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_docker.sh b/scripts/update_docker.sh index e1cc66176..c55dc4bc3 100755 --- a/scripts/update_docker.sh +++ b/scripts/update_docker.sh @@ -2,7 +2,7 @@ set -ex -DOCKER_VERSION="1.9.1" +DOCKER_VERSION="1.10.2" sudo stop docker sudo rm -rf /var/lib/docker From 1f77aa5dfe6f52fbe1d0b775466a66a888ee2b93 Mon Sep 17 00:00:00 2001 From: Abhishek Chanda Date: Thu, 3 Mar 2016 18:37:24 -0800 Subject: [PATCH 2/2] Always use the new package config if there is a conflict --- scripts/update_docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_docker.sh b/scripts/update_docker.sh index c55dc4bc3..18b258ee4 100755 --- a/scripts/update_docker.sh +++ b/scripts/update_docker.sh @@ -10,6 +10,6 @@ sudo rm -f `which docker` sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list sudo apt-get update -sudo apt-get install docker-engine=$DOCKER_VERSION-0~`lsb_release -cs` -y --force-yes +sudo apt-get install -y --force-yes -o Dpkg::Options::="--force-confnew" docker-engine=$DOCKER_VERSION-0~`lsb_release -cs` docker version