Merge pull request #107 from StefanScherer/update-traefik-1.2.1

StefanScherer · web-flow · commit fdd70a68dbdb · 2017-03-28T08:54:35.000+02:00
Update traefik 1.2.1
diff --git a/traefik/Dockerfile b/traefik/Dockerfile
@@ -1,6 +1,6 @@
 FROM microsoft/nanoserver
 
-ADD https://github.com/containous/traefik/releases/download/v1.2.0/traefik_windows-amd64 /traefik.exe
+ADD https://github.com/containous/traefik/releases/download/v1.2.1/traefik_windows-amd64 /traefik.exe
 
 VOLUME C:/etc/traefik
 VOLUME C:/etc/ssl
@@ -13,5 +13,5 @@ LABEL org.label-schema.vendor="Containous" \
       org.label-schema.url="https://traefik.io" \
       org.label-schema.name="Traefik" \
       org.label-schema.description="A modern reverse-proxy" \
-      org.label-schema.version="v1.2.0" \
+      org.label-schema.version="v1.2.1" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik/push.ps1 b/traefik/push.ps1
@@ -1,4 +1,4 @@
 docker tag traefik stefanscherer/traefik-windows
-docker tag traefik stefanscherer/traefik-windows:v1.2.0
-docker push stefanscherer/traefik-windows:v1.2.0
+docker tag traefik stefanscherer/traefik-windows:v1.2.1
+docker push stefanscherer/traefik-windows:v1.2.1
 docker push stefanscherer/traefik-windows
diff --git a/traefik/test.ps1 b/traefik/test.ps1
@@ -1 +1 @@
-docker run traefik --help 2>&1
+docker run --entrypoint traefik traefik version

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-docker run traefik --help 2>&1`
	`1`	`+docker run --entrypoint traefik traefik version`