Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Traefik to v1.5.0-rc1 #3748

Conversation

ldez
Copy link
Contributor

@ldez ldez commented Nov 28, 2017

Hello,

This PR updates Traefik to v1.5.0-rc1.

/cc @vdemeester @emilevauge

Cheers

Copy link
Contributor

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐯

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 3f91bc2..2eaeb80 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,6 +1,12 @@
 traefik:alpine @ amd64
 traefik:alpine @ arm32v6
 traefik:alpine @ arm64v8
+traefik:cancoillotte @ amd64
+traefik:cancoillotte @ arm32v6
+traefik:cancoillotte @ arm64v8
+traefik:cancoillotte-alpine @ amd64
+traefik:cancoillotte-alpine @ arm32v6
+traefik:cancoillotte-alpine @ arm64v8
 traefik:latest @ amd64
 traefik:latest @ arm32v6
 traefik:latest @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index e9baaf9..55f73bf 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,7 +2,13 @@ traefik:1.4
 traefik:1.4-alpine
 traefik:1.4.4
 traefik:1.4.4-alpine
+traefik:1.5
+traefik:1.5-alpine
+traefik:1.5.0-rc1
+traefik:1.5.0-rc1-alpine
 traefik:alpine
+traefik:cancoillotte
+traefik:cancoillotte-alpine
 traefik:latest
 traefik:roquefort
 traefik:roquefort-alpine
@@ -10,3 +16,7 @@ traefik:v1.4
 traefik:v1.4-alpine
 traefik:v1.4.4
 traefik:v1.4.4-alpine
+traefik:v1.5
+traefik:v1.5-alpine
+traefik:v1.5.0-rc1
+traefik:v1.5.0-rc1-alpine
diff --git a/traefik_alpine/Dockerfile b/traefik_cancoillotte-alpine/Dockerfile
similarity index 88%
copy from traefik_alpine/Dockerfile
copy to traefik_cancoillotte-alpine/Dockerfile
index dd7ba46..05ab9de 100644
--- a/traefik_alpine/Dockerfile
+++ b/traefik_cancoillotte-alpine/Dockerfile
@@ -9,7 +9,7 @@ RUN set -ex; \
 		*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
 	esac; \
 	apk add --no-cache --virtual .fetch-deps libressl; \
-	wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.4.4/traefik_linux-$arch"; \
+	wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.5.0-rc1/traefik_linux-$arch"; \
 	apk del .fetch-deps; \
 	chmod +x /usr/local/bin/traefik
 COPY entrypoint.sh /
@@ -22,5 +22,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.4.4" \
+      org.label-schema.version="v1.5.0-rc1" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_alpine/entrypoint.sh b/traefik_cancoillotte-alpine/entrypoint.sh
similarity index 100%
copy from traefik_alpine/entrypoint.sh
copy to traefik_cancoillotte-alpine/entrypoint.sh
diff --git a/traefik_latest/Dockerfile b/traefik_cancoillotte/Dockerfile
similarity index 88%
copy from traefik_latest/Dockerfile
copy to traefik_cancoillotte/Dockerfile
index efcde61..bf13cf1 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_cancoillotte/Dockerfile
@@ -9,5 +9,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.4.4" \
+      org.label-schema.version="v1.5.0-rc1" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_latest/certs/ca-certificates.crt b/traefik_cancoillotte/certs/ca-certificates.crt
similarity index 100%
copy from traefik_latest/certs/ca-certificates.crt
copy to traefik_cancoillotte/certs/ca-certificates.crt
diff --git a/traefik_latest/traefik b/traefik_cancoillotte/traefik
similarity index 75%
copy from traefik_latest/traefik
copy to traefik_cancoillotte/traefik
index ed01253..e91bdc2 100755
Binary files a/traefik_latest/traefik and b/traefik_cancoillotte/traefik differ

@yosifkit
Copy link
Member

Build test of #3748; 65a2342; amd64 (traefik):

$ bashbrew build traefik:v1.5.0-rc1
Building bashbrew/cache:0f03930beb37a0b0f988806b82105f07fc591eb87e11d5f3dce5ebf309f554b5 (traefik:v1.5.0-rc1)
Tagging traefik:v1.5.0-rc1
Tagging traefik:1.5.0-rc1
Tagging traefik:v1.5
Tagging traefik:1.5
Tagging traefik:cancoillotte

$ test/run.sh traefik:v1.5.0-rc1
testing traefik:v1.5.0-rc1
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed


$ bashbrew build traefik:v1.5.0-rc1-alpine
Building bashbrew/cache:be71ef6741b9ecf470db99344dad1423bbb9630138ade3203a1fcaf21f9ed6ad (traefik:v1.5.0-rc1-alpine)
Tagging traefik:v1.5.0-rc1-alpine
Tagging traefik:1.5.0-rc1-alpine
Tagging traefik:v1.5-alpine
Tagging traefik:1.5-alpine
Tagging traefik:cancoillotte-alpine

$ test/run.sh traefik:v1.5.0-rc1-alpine
testing traefik:v1.5.0-rc1-alpine
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...passed


$ bashbrew build traefik:v1.4.4
Using bashbrew/cache:17c439935d710af4187e2c4a2b997906ff50f98701d41b58b309b99f056f13ca (traefik:v1.4.4)
Tagging traefik:v1.4.4
Tagging traefik:1.4.4
Tagging traefik:v1.4
Tagging traefik:1.4
Tagging traefik:roquefort
Tagging traefik:latest

$ test/run.sh traefik:v1.4.4
testing traefik:v1.4.4
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed


$ bashbrew build traefik:v1.4.4-alpine
Using bashbrew/cache:1a50706a94ff2d0f75c8bb81f64b123f9850ebde11c84ba3b01c84d5eede13f7 (traefik:v1.4.4-alpine)
Tagging traefik:v1.4.4-alpine
Tagging traefik:1.4.4-alpine
Tagging traefik:v1.4-alpine
Tagging traefik:1.4-alpine
Tagging traefik:roquefort-alpine
Tagging traefik:alpine

$ test/run.sh traefik:v1.4.4-alpine
testing traefik:v1.4.4-alpine
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...passed

@yosifkit yosifkit merged commit 04318b5 into docker-library:master Nov 28, 2017
@ldez ldez deleted the traefik-new-version-14a1d1d5727338efd0a90a33024360e3e8926daa branch November 28, 2017 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants