-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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-rc2 and v1.4.5 #3782
Merged
tianon
merged 2 commits into
docker-library:master
from
ldez:traefik-new-version-da850273777e5a6013b7938836c6da4568622a04
Dec 7, 2017
Merged
Bump Traefik to v1.5.0-rc2 and v1.4.5 #3782
tianon
merged 2 commits into
docker-library:master
from
ldez:traefik-new-version-da850273777e5a6013b7938836c6da4568622a04
Dec 7, 2017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emilevauge
reviewed
Dec 6, 2017
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
vdemeester
approved these changes
Dec 6, 2017
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🐮
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index 55f73bf..a4bba85 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,11 +1,11 @@
traefik:1.4
traefik:1.4-alpine
-traefik:1.4.4
-traefik:1.4.4-alpine
+traefik:1.4.5
+traefik:1.4.5-alpine
traefik:1.5
traefik:1.5-alpine
-traefik:1.5.0-rc1
-traefik:1.5.0-rc1-alpine
+traefik:1.5.0-rc2
+traefik:1.5.0-rc2-alpine
traefik:alpine
traefik:cancoillotte
traefik:cancoillotte-alpine
@@ -14,9 +14,9 @@ traefik:roquefort
traefik:roquefort-alpine
traefik:v1.4
traefik:v1.4-alpine
-traefik:v1.4.4
-traefik:v1.4.4-alpine
+traefik:v1.4.5
+traefik:v1.4.5-alpine
traefik:v1.5
traefik:v1.5-alpine
-traefik:v1.5.0-rc1
-traefik:v1.5.0-rc1-alpine
+traefik:v1.5.0-rc2
+traefik:v1.5.0-rc2-alpine
diff --git a/traefik_alpine/Dockerfile b/traefik_alpine/Dockerfile
index dd7ba46..16f56d0 100644
--- a/traefik_alpine/Dockerfile
+++ b/traefik_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.4.5/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.4.5" \
org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_cancoillotte-alpine/Dockerfile b/traefik_cancoillotte-alpine/Dockerfile
index 05ab9de..aec3a50 100644
--- a/traefik_cancoillotte-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.5.0-rc1/traefik_linux-$arch"; \
+ wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.5.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.5.0-rc1" \
+ org.label-schema.version="v1.5.0-rc2" \
org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_cancoillotte/Dockerfile b/traefik_cancoillotte/Dockerfile
index bf13cf1..cdec840 100644
--- a/traefik_cancoillotte/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.5.0-rc1" \
+ org.label-schema.version="v1.5.0-rc2" \
org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_cancoillotte/traefik b/traefik_cancoillotte/traefik
index e91bdc2..496f449 100755
Binary files a/traefik_cancoillotte/traefik and b/traefik_cancoillotte/traefik differ
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index efcde61..80091b8 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_latest/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.4.5" \
org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_latest/traefik b/traefik_latest/traefik
index ed01253..a557ae2 100755
Binary files a/traefik_latest/traefik and b/traefik_latest/traefik differ |
LGTM Build test of #3782; cfd13f4; $ bashbrew build traefik:v1.5.0-rc2
Building bashbrew/cache:913c37ba6f1ae026b98466c93a8adeca2d8928ea4481d78cf5809013d0cb889b (traefik:v1.5.0-rc2)
Tagging traefik:v1.5.0-rc2
Tagging traefik:1.5.0-rc2
Tagging traefik:v1.5
Tagging traefik:1.5
Tagging traefik:cancoillotte
$ test/run.sh traefik:v1.5.0-rc2
testing traefik:v1.5.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.5.0-rc2-alpine
Building bashbrew/cache:a69e1ee767132de0b4e16d9a5441b337181a33e884d3bf6cbe2450a9dcf895ad (traefik:v1.5.0-rc2-alpine)
Tagging traefik:v1.5.0-rc2-alpine
Tagging traefik:1.5.0-rc2-alpine
Tagging traefik:v1.5-alpine
Tagging traefik:1.5-alpine
Tagging traefik:cancoillotte-alpine
$ test/run.sh traefik:v1.5.0-rc2-alpine
testing traefik:v1.5.0-rc2-alpine
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...passed
$ bashbrew build traefik:v1.4.5
Building bashbrew/cache:8d910c2fb86a22f9676b9a9b05f66feca1645f307ced67942b76cb9df5429a06 (traefik:v1.4.5)
Tagging traefik:v1.4.5
Tagging traefik:1.4.5
Tagging traefik:v1.4
Tagging traefik:1.4
Tagging traefik:roquefort
Tagging traefik:latest
$ test/run.sh traefik:v1.4.5
testing traefik:v1.4.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.4.5-alpine
Building bashbrew/cache:6506bcf5e97302f88859d4d6b2dabff48be7ee9eafd7c2330676b69e9754a18d (traefik:v1.4.5-alpine)
Tagging traefik:v1.4.5-alpine
Tagging traefik:1.4.5-alpine
Tagging traefik:v1.4-alpine
Tagging traefik:1.4-alpine
Tagging traefik:roquefort-alpine
Tagging traefik:alpine
$ test/run.sh traefik:v1.4.5-alpine
testing traefik:v1.4.5-alpine
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello,
This PR updates Traefik to v1.5.0-rc2.
/cc @vdemeester @emilevauge
Cheers