From 75dd026e17e88474c80af2f7c9e0f895296548f7 Mon Sep 17 00:00:00 2001 From: stirringhalo Date: Thu, 13 Apr 2017 20:07:41 -0400 Subject: [PATCH] Set Docker Version in Travis to 1.11.0 (#221) * Set version to 1.11.0 * Change min docker version in quickstart --- .travis.yml | 2 +- quickstart.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14a1b97..f80f356 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - sudo apt-get clean - sudo apt-get update - sudo apt-key update - - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine + - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=1.11.0-0~xenial - sudo rm -f /usr/local/bin/docker-compose - curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose diff --git a/quickstart.sh b/quickstart.sh index 947a309..b02d4a1 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -31,7 +31,7 @@ testdata=${osm_area}.osm.pbf ## Min versions ... MIN_COMPOSE_VER=1.7.1 -MIN_DOCKER_VER=1.10.0 +MIN_DOCKER_VER=1.11.0 STARTTIME=$(date +%s) STARTDATE=$(date +"%Y-%m-%dT%H:%M%z") githash=$( git rev-parse HEAD )