Merge branch 'v1.3'

This commit is contained in:
Fernandez Ludovic 2017-06-27 14:42:12 +02:00
commit 73e10c96cc
14 changed files with 303 additions and 41 deletions

View file

@ -2,7 +2,7 @@
set -e
sudo -E apt-get -yq update
sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install docker-engine=${DOCKER_VERSION}*
sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install docker-ce=${DOCKER_VERSION}*
docker version
pip install --user -r requirements.txt

View file

@ -3,7 +3,7 @@ set -e
export REPO='containous/traefik'
export DOCKER_VERSION=1.12.6
export DOCKER_VERSION=17.03.0
if VERSION=$(git describe --exact-match --abbrev=0 --tags);
then