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-rc3 #3464

Conversation

ldez
Copy link
Contributor

@ldez ldez commented Sep 18, 2017

Hello,

This PR updates Traefik to v1.4.0-rc3.

/cc @vdemeester @emilevauge

Cheers

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index e753729..4df3fa0 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -6,3 +6,5 @@ traefik:roquefort @ amd64
 traefik:roquefort @ arm32v6
 traefik:roquefort @ arm64v8
 traefik:roquefort-alpine @ amd64
+traefik:roquefort-alpine @ arm32v6
+traefik:roquefort-alpine @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 2e418c7..4df7a8b 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-rc2
-traefik:1.4.0-rc2-alpine
+traefik:1.4.0-rc3
+traefik:1.4.0-rc3-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-rc2
-traefik:v1.4.0-rc2-alpine
+traefik:v1.4.0-rc3
+traefik:v1.4.0-rc3-alpine
diff --git a/traefik_roquefort-alpine/Dockerfile b/traefik_roquefort-alpine/Dockerfile
index 5e47d74..47275dd 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-rc2/traefik_linux-$arch"; \
+	wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.4.0-rc3/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-rc2" \
+      org.label-schema.version="v1.4.0-rc3" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_roquefort/Dockerfile b/traefik_roquefort/Dockerfile
index bb94523..cd612b7 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-rc2" \
+      org.label-schema.version="v1.4.0-rc3" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_roquefort/traefik b/traefik_roquefort/traefik
index 96a9a33..9384399 100755
Binary files a/traefik_roquefort/traefik and b/traefik_roquefort/traefik differ

library/traefik Outdated
Architectures: amd64
GitCommit: 57f83af9d2719e5f25e6c769fd2640f973b519dc
Tags: v1.4.0-rc3-alpine, 1.4.0-rc3-alpine, v1.4-alpine, 1.4-alpine, roquefort-alpine
Architectures: amd64, arm64v8, arm32v6
Copy link
Member

Choose a reason for hiding this comment

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

This one still needs to wait on gliderlabs/docker-alpine#304 for non-amd64 architectures. 😢

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes sorry.

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 2e418c7..4df7a8b 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-rc2
-traefik:1.4.0-rc2-alpine
+traefik:1.4.0-rc3
+traefik:1.4.0-rc3-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-rc2
-traefik:v1.4.0-rc2-alpine
+traefik:v1.4.0-rc3
+traefik:v1.4.0-rc3-alpine
diff --git a/traefik_roquefort-alpine/Dockerfile b/traefik_roquefort-alpine/Dockerfile
index 5e47d74..47275dd 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-rc2/traefik_linux-$arch"; \
+	wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.4.0-rc3/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-rc2" \
+      org.label-schema.version="v1.4.0-rc3" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_roquefort/Dockerfile b/traefik_roquefort/Dockerfile
index bb94523..cd612b7 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-rc2" \
+      org.label-schema.version="v1.4.0-rc3" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_roquefort/traefik b/traefik_roquefort/traefik
index 96a9a33..9384399 100755
Binary files a/traefik_roquefort/traefik and b/traefik_roquefort/traefik differ

Build test of #3464; 39abeca (traefik):

$ bashbrew build traefik:v1.4.0-rc3
Using bashbrew/cache:b666dff2878685d6579ad432c1fb7eb19009f6c5e9097a7ee75d68dc9ad1246a (traefik:v1.4.0-rc3)
Tagging traefik:v1.4.0-rc3
Tagging traefik:1.4.0-rc3
Tagging traefik:v1.4
Tagging traefik:1.4
Tagging traefik:roquefort

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

$ test/run.sh traefik:v1.4.0-rc3-alpine
testing traefik:v1.4.0-rc3-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

@yosifkit yosifkit merged commit 6a886bd into docker-library:master Sep 18, 2017
@ldez ldez deleted the traefik-new-version-167c6ac81bbf39bebfbe4fdfef0e931ab33e9cac branch September 18, 2017 18:06
@emilevauge
Copy link
Contributor

@yosifkit @tianon Just in case you don't already know, it seems the hub is a bit broken https://hub.docker.com/r/containous/traefik/builds.

@tianon
Copy link
Member

tianon commented Sep 18, 2017

That's distressing! 😕 That'd be something to email support@docker.com about though (we don't have any access or control on Hub or automated builds). 😞 ❤️

@emilevauge
Copy link
Contributor

@tianon Sorry, wrong link 😊 I mean that the official has not built: traefik:v1.4.0-rc3 is still not available at https://hub.docker.com/r/library/traefik/tags. I was thinking that the whole Docker Hub was broken has our image also doesn't build ;)

@tianon
Copy link
Member

tianon commented Sep 18, 2017

Ah, the official images are now built via Jenkins (since with multiarch, our old mostly-manual process became instantly untenable). They should kick off fairly soon, but I've triggered them manually now to get them out faster. 👍

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