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.4.0-rc4 #3524

Conversation

ldez
Copy link
Contributor

@ldez ldez commented Oct 2, 2017

Hello,

This PR updates Traefik to v1.4.0-rc4.

/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 👼

Copy link
Contributor

@emilevauge emilevauge left a comment

Choose a reason for hiding this comment

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

LGTM

@tianon
Copy link
Member

tianon commented Oct 2, 2017

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 4df7a8b..d2e4d93 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,8 +4,8 @@ traefik:1.3.8
 traefik:1.3.8-alpine
 traefik:1.4
 traefik:1.4-alpine
-traefik:1.4.0-rc3
-traefik:1.4.0-rc3-alpine
+traefik:1.4.0-rc4
+traefik:1.4.0-rc4-alpine
 traefik:alpine
 traefik:latest
 traefik:raclette
@@ -18,5 +18,5 @@ traefik:v1.3.8
 traefik:v1.3.8-alpine
 traefik:v1.4
 traefik:v1.4-alpine
-traefik:v1.4.0-rc3
-traefik:v1.4.0-rc3-alpine
+traefik:v1.4.0-rc4
+traefik:v1.4.0-rc4-alpine
diff --git a/traefik_roquefort-alpine/Dockerfile b/traefik_roquefort-alpine/Dockerfile
index 47275dd..f53c437 100644
--- a/traefik_roquefort-alpine/Dockerfile
+++ b/traefik_roquefort-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.0-rc3/traefik_linux-$arch"; \
+	wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.4.0-rc4/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.0-rc3" \
+      org.label-schema.version="v1.4.0-rc4" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_roquefort/Dockerfile b/traefik_roquefort/Dockerfile
index cd612b7..6cb162e 100644
--- a/traefik_roquefort/Dockerfile
+++ b/traefik_roquefort/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.0-rc3" \
+      org.label-schema.version="v1.4.0-rc4" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_roquefort/traefik b/traefik_roquefort/traefik
index 9384399..d3b608e 100755
Binary files a/traefik_roquefort/traefik and b/traefik_roquefort/traefik differ

@tianon
Copy link
Member

tianon commented Oct 2, 2017

LGTM

Build test of #3524; 43493df (traefik):

$ bashbrew build traefik:v1.4.0-rc4
Building bashbrew/cache:c3535925d086ae5d570d8bc1dc5e39394140c3c76893534110ad4ab99cc3217e (traefik:v1.4.0-rc4)
Tagging traefik:v1.4.0-rc4
Tagging traefik:1.4.0-rc4
Tagging traefik:v1.4
Tagging traefik:1.4
Tagging traefik:roquefort

$ test/run.sh traefik:v1.4.0-rc4
testing traefik:v1.4.0-rc4
	'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.0-rc4-alpine
Building bashbrew/cache:dd6004c66760369e9376d7c2b58b8c2e81837dffc6d751bd06390eeccbacb1fa (traefik:v1.4.0-rc4-alpine)
Tagging traefik:v1.4.0-rc4-alpine
Tagging traefik:1.4.0-rc4-alpine
Tagging traefik:v1.4-alpine
Tagging traefik:1.4-alpine
Tagging traefik:roquefort-alpine

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


$ bashbrew build traefik:v1.3.8
Using bashbrew/cache:9c9ef67dd208a0925fcdc5d6eff4bf85982cd2ecb74359d7684d5f2ce9b10506 (traefik:v1.3.8)
Tagging traefik:v1.3.8
Tagging traefik:1.3.8
Tagging traefik:v1.3
Tagging traefik:1.3
Tagging traefik:raclette
Tagging traefik:latest

$ test/run.sh traefik:v1.3.8
testing traefik:v1.3.8
	'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.3.8-alpine
Using bashbrew/cache:f4a8ba281f86a839b95b28c3f4f6bc012b859d5f2c7cab38b0435b6315149731 (traefik:v1.3.8-alpine)
Tagging traefik:v1.3.8-alpine
Tagging traefik:1.3.8-alpine
Tagging traefik:v1.3-alpine
Tagging traefik:1.3-alpine
Tagging traefik:raclette-alpine
Tagging traefik:alpine

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

@tianon tianon merged commit 5d30e11 into docker-library:master Oct 2, 2017
@ldez ldez deleted the traefik-new-version-d807e0f3692209f960bb2567e7890453a190c899 branch October 2, 2017 17:38
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.

5 participants