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.7.0-rc2 #4602

Conversation

nmengin
Copy link
Contributor

@nmengin nmengin commented Jul 17, 2018

Hello,

This PR updates Traefik to v1.7.0-rc2.

/cc @vdemeester @emilevauge @ldez

Cheers

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 🐸

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

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index a3a5ff1..86abfa5 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,8 +4,8 @@ traefik:1.6.5
 traefik:1.6.5-alpine
 traefik:1.7
 traefik:1.7-alpine
-traefik:1.7.0-rc1
-traefik:1.7.0-rc1-alpine
+traefik:1.7.0-rc2
+traefik:1.7.0-rc2-alpine
 traefik:alpine
 traefik:latest
 traefik:maroilles
@@ -18,5 +18,5 @@ traefik:v1.6.5
 traefik:v1.6.5-alpine
 traefik:v1.7
 traefik:v1.7-alpine
-traefik:v1.7.0-rc1
-traefik:v1.7.0-rc1-alpine
+traefik:v1.7.0-rc2
+traefik:v1.7.0-rc2-alpine
diff --git a/traefik_maroilles-alpine/Dockerfile b/traefik_maroilles-alpine/Dockerfile
index 6a5aa4c..10a6043 100644
--- a/traefik_maroilles-alpine/Dockerfile
+++ b/traefik_maroilles-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.7.0-rc1/traefik_linux-$arch"; \
+	wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.7.0-rc2/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.7.0-rc1" \
+      org.label-schema.version="v1.7.0-rc2" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_maroilles/Dockerfile b/traefik_maroilles/Dockerfile
index 64dda8f..e31f36b 100644
--- a/traefik_maroilles/Dockerfile
+++ b/traefik_maroilles/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.7.0-rc1" \
+      org.label-schema.version="v1.7.0-rc2" \
       org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_maroilles/traefik b/traefik_maroilles/traefik
index 2bd30e4..2175480 100755
Binary files a/traefik_maroilles/traefik and b/traefik_maroilles/traefik differ

Build test of #4602; f8a2301; amd64 (traefik):

$ bashbrew build traefik:v1.7.0-rc2
Building bashbrew/cache:bd15a881c0b0662422c3bc6628d231d621108bea880d7cfacdcb3b27d71abaf6 (traefik:v1.7.0-rc2)
Tagging traefik:v1.7.0-rc2
Tagging traefik:1.7.0-rc2
Tagging traefik:v1.7
Tagging traefik:1.7
Tagging traefik:maroilles

$ test/run.sh traefik:v1.7.0-rc2
testing traefik:v1.7.0-rc2
	'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.7.0-rc2-alpine
Building bashbrew/cache:19ecab99c555810cff4401f5cb189e3c97ec7b5cdf08a4097fdd8c6a4860b6de (traefik:v1.7.0-rc2-alpine)
Tagging traefik:v1.7.0-rc2-alpine
Tagging traefik:1.7.0-rc2-alpine
Tagging traefik:v1.7-alpine
Tagging traefik:1.7-alpine
Tagging traefik:maroilles-alpine

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


$ bashbrew build traefik:v1.6.5
Using bashbrew/cache:7d77a2ae55da9b1fe1ef388a3adb2c96f936e5b8eccd20833e55103fc08ec54a (traefik:v1.6.5)
Tagging traefik:v1.6.5
Tagging traefik:1.6.5
Tagging traefik:v1.6
Tagging traefik:1.6
Tagging traefik:tetedemoine
Tagging traefik:latest

$ test/run.sh traefik:v1.6.5
testing traefik:v1.6.5
	'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.5-alpine
Using bashbrew/cache:c475c512b5644cc79fab2a566ac9ef2c9524b8f2294099a5de3a287c4057dad0 (traefik:v1.6.5-alpine)
Tagging traefik:v1.6.5-alpine
Tagging traefik:1.6.5-alpine
Tagging traefik:v1.6-alpine
Tagging traefik:1.6-alpine
Tagging traefik:tetedemoine-alpine
Tagging traefik:alpine

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

@yosifkit yosifkit merged commit f36bc01 into docker-library:master Jul 17, 2018
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