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.6.0-rc1 #4171

Conversation

juliens
Copy link
Contributor

@juliens juliens commented Mar 26, 2018

Hello,

This PR updates Traefik to v1.6.0-rc1.

/cc @vdemeester @emilevauge @ldez

Cheers

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 🎉

Copy link
Contributor

@ldez ldez 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

@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..4a32dca 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -4,3 +4,9 @@ traefik:alpine @ arm64v8
 traefik:latest @ amd64
 traefik:latest @ arm32v6
 traefik:latest @ arm64v8
+traefik:tetedemoine @ amd64
+traefik:tetedemoine @ arm32v6
+traefik:tetedemoine @ arm64v8
+traefik:tetedemoine-alpine @ amd64
+traefik:tetedemoine-alpine @ arm32v6
+traefik:tetedemoine-alpine @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index d49f17c..ad6fbb1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,11 +2,21 @@ traefik:1.5
 traefik:1.5-alpine
 traefik:1.5.4
 traefik:1.5.4-alpine
+traefik:1.6
+traefik:1.6-alpine
+traefik:1.6.0-rc1
+traefik:1.6.0-rc1-alpine
 traefik:alpine
 traefik:cancoillotte
 traefik:cancoillotte-alpine
 traefik:latest
+traefik:tetedemoine
+traefik:tetedemoine-alpine
 traefik:v1.5
 traefik:v1.5-alpine
 traefik:v1.5.4
 traefik:v1.5.4-alpine
+traefik:v1.6
+traefik:v1.6-alpine
+traefik:v1.6.0-rc1
+traefik:v1.6.0-rc1-alpine
diff --git a/traefik_alpine/Dockerfile b/traefik_tetedemoine-alpine/Dockerfile
similarity index 88%
copy from traefik_alpine/Dockerfile
copy to traefik_tetedemoine-alpine/Dockerfile
index 9521222..3058f21 100644
--- a/traefik_alpine/Dockerfile
+++ b/traefik_tetedemoine-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.5.4/traefik_linux-$arch"; \
+	wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.6.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.5.4" \
+      org.label-schema.version="v1.6.0-rc1" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_alpine/entrypoint.sh b/traefik_tetedemoine-alpine/entrypoint.sh
similarity index 100%
copy from traefik_alpine/entrypoint.sh
copy to traefik_tetedemoine-alpine/entrypoint.sh
diff --git a/traefik_latest/Dockerfile b/traefik_tetedemoine/Dockerfile
similarity index 88%
copy from traefik_latest/Dockerfile
copy to traefik_tetedemoine/Dockerfile
index 23bddb6..52338e3 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_tetedemoine/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.5.4" \
+      org.label-schema.version="v1.6.0-rc1" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_latest/certs/ca-certificates.crt b/traefik_tetedemoine/certs/ca-certificates.crt
similarity index 100%
copy from traefik_latest/certs/ca-certificates.crt
copy to traefik_tetedemoine/certs/ca-certificates.crt
diff --git a/traefik_latest/traefik b/traefik_tetedemoine/traefik
similarity index 76%
copy from traefik_latest/traefik
copy to traefik_tetedemoine/traefik
index 5170b8c..e19e8f8 100755
Binary files a/traefik_latest/traefik and b/traefik_tetedemoine/traefik differ

@yosifkit
Copy link
Member

Build test of #4171; 255c9a7; amd64 (traefik):

$ bashbrew build traefik:v1.6.0-rc1
Building bashbrew/cache:84f77f9d6958cc8da43eeedb696626ec45172dfc9d791af2591cef1abff70e1d (traefik:v1.6.0-rc1)
Tagging traefik:v1.6.0-rc1
Tagging traefik:1.6.0-rc1
Tagging traefik:v1.6
Tagging traefik:1.6
Tagging traefik:tetedemoine

$ test/run.sh traefik:v1.6.0-rc1
testing traefik:v1.6.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.6.0-rc1-alpine
Building bashbrew/cache:0bda235de8356c05a3ba7857e90cd5bc1af1f3fc486e1bbc341c9c872a6f6a88 (traefik:v1.6.0-rc1-alpine)
Tagging traefik:v1.6.0-rc1-alpine
Tagging traefik:1.6.0-rc1-alpine
Tagging traefik:v1.6-alpine
Tagging traefik:1.6-alpine
Tagging traefik:tetedemoine-alpine

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


$ bashbrew build traefik:v1.5.4
Using bashbrew/cache:8628de266ab35d5294c6f7948f2f1761184f66de44eb763229b9b0ee50884b1f (traefik:v1.5.4)
Tagging traefik:v1.5.4
Tagging traefik:1.5.4
Tagging traefik:v1.5
Tagging traefik:1.5
Tagging traefik:cancoillotte
Tagging traefik:latest

$ test/run.sh traefik:v1.5.4
testing traefik:v1.5.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.5.4-alpine
Using bashbrew/cache:c1f17a7a6a25dd8f4978f8f017d998ca07f01fd77fbca19fc51cb75f6f0d3295 (traefik:v1.5.4-alpine)
Tagging traefik:v1.5.4-alpine
Tagging traefik:1.5.4-alpine
Tagging traefik:v1.5-alpine
Tagging traefik:1.5-alpine
Tagging traefik:cancoillotte-alpine
Tagging traefik:alpine

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

@yosifkit yosifkit merged commit 4412ecf into docker-library:master Mar 26, 2018
@emilevauge
Copy link
Contributor

@yosifkit @tianon it seems there is still issues with those builds.
The Jenkins job has been pending for ~ 4 hours: https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/traefik/73/
Anything we can do on this ?

@yosifkit
Copy link
Member

Yeah, our Jenkins server keeps triggering every image build on "scm change" and overloading the queue. @tianon has been working on a solution to alleviate the queue explosions while also speeding up no-op builds.

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.

6 participants