From 7a34303593f256a9b9a76eb02e50fdb5eaf0b741 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ludovic@containo.us>
Date: Tue, 27 Jun 2017 22:56:19 +0200
Subject: [PATCH] chore: Bump Docker version to 17.03

---
 .semaphoreci/vars       | 2 --
 .travis.yml             | 3 +--
 build.Dockerfile        | 2 +-
 script/deploy-docker.sh | 2 +-
 script/deploy.sh        | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.semaphoreci/vars b/.semaphoreci/vars
index c2078ecc6..2febcf913 100644
--- a/.semaphoreci/vars
+++ b/.semaphoreci/vars
@@ -5,8 +5,6 @@ export secure='btt4r13t09gQlHb6gYrvGC2yGCMMHfnp1Mz1RQedc4Mpf/FfT8aE6xmK2a2i9CCvs
 
 export REPO='containous/traefik'
 
-export DOCKER_VERSION=17.03.0
-
 if VERSION=$(git describe --exact-match --abbrev=0 --tags);
 then
   export VERSION
diff --git a/.travis.yml b/.travis.yml
index 919533465..0a8240752 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ env:
     - VERSION: $TRAVIS_TAG
     - CODENAME: raclette
     - N_MAKE_JOBS: 2
-    - DOCKER_VERSION: 1.12.6
 
 script:
 - echo "Skipping tests... (Tests are executed on SemaphoreCI)"
@@ -21,7 +20,7 @@ before_deploy:
     if ! [ "$BEFORE_DEPLOY_RUN" ]; then
       export BEFORE_DEPLOY_RUN=1;
       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;
       make -j${N_MAKE_JOBS} crossbinary-parallel;
diff --git a/build.Dockerfile b/build.Dockerfile
index ab34901da..ebe999d68 100644
--- a/build.Dockerfile
+++ b/build.Dockerfile
@@ -15,7 +15,7 @@ RUN go get github.com/jteeuwen/go-bindata/... \
 && go get github.com/sgotti/glide-vc
 
 # Which docker version to test on
-ARG DOCKER_VERSION=1.10.3
+ARG DOCKER_VERSION=17.03.1
 
 
 # Which glide version to test on
diff --git a/script/deploy-docker.sh b/script/deploy-docker.sh
index 968bac43b..d73a95faa 100644
--- a/script/deploy-docker.sh
+++ b/script/deploy-docker.sh
@@ -10,7 +10,7 @@ fi
 
 # create docker image containous/traefik
 echo "Updating docker containous/traefik image..."
-docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+docker login -u $DOCKER_USER -p $DOCKER_PASS
 docker tag containous/traefik containous/traefik:${TRAVIS_COMMIT}
 docker push containous/traefik:${TRAVIS_COMMIT}
 docker tag containous/traefik containous/traefik:experimental
diff --git a/script/deploy.sh b/script/deploy.sh
index 0f445f28f..f04f2ad26 100755
--- a/script/deploy.sh
+++ b/script/deploy.sh
@@ -30,7 +30,7 @@ git push -q --follow-tags -u origin master > /dev/null 2>&1
 
 # create docker image emilevauge/traefik (compatibility)
 echo "Updating docker emilevauge/traefik image..."
-docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+docker login -u $DOCKER_USER -p $DOCKER_PASS
 docker tag containous/traefik emilevauge/traefik:latest
 docker push emilevauge/traefik:latest
 docker tag emilevauge/traefik:latest emilevauge/traefik:${VERSION}