cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set Docker Version in Travis to 1.11.0 (#221)

Browse Source 
* Set version to 1.11.0

* Change min docker version in quickstart
This commit is contained in:
stirringhalo 2017-04-13 20:07:41 -04:00 committed by GitHub
parent 067b1140d5
commit 75dd026e17
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -13,7 +13,7 @@ before_install:
- sudo apt-get clean - sudo apt-get clean
- sudo apt-get update - sudo apt-get update
- sudo apt-key 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 - 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 - curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose - chmod +x docker-compose

2
quickstart.sh
View File

@ -31,7 +31,7 @@ testdata=${osm_area}.osm.pbf
## Min versions ... ## Min versions ...
MIN_COMPOSE_VER=1.7.1 MIN_COMPOSE_VER=1.7.1
MIN_DOCKER_VER=1.10.0 MIN_DOCKER_VER=1.11.0
STARTTIME=$(date +%s) STARTTIME=$(date +%s)
STARTDATE=$(date +"%Y-%m-%dT%H:%M%z") STARTDATE=$(date +"%Y-%m-%dT%H:%M%z")
githash=$( git rev-parse HEAD ) githash=$( git rev-parse HEAD )