-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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.3.8 & v1.4.0-rc2 #3426
Conversation
Hello, This PR updates Traefik to v1.3.8. /cc @vdemeester @emilevauge Cheers
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 😎
Alpine does not officially have multi-arch yet, so the Alpine variant will need to wait for gliderlabs/docker-alpine#304 before it can support multiarchitecture. Also, see https://github.com/docker-library/official-images#multiple-architectures for details about what Additionally, Here's what I'd recommend instead: FROM alpine:3.6
RUN apk --no-cache add ca-certificates
RUN set -ex; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
armhf) arch='arm' ;; \
aarch64) arch='arm64' ;; \
x86_64) arch='amd64' ;; \
*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
esac; \
wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.3.8/traefik_linux-$arch"; \
chmod +x /usr/local/bin/traefik
COPY entrypoint.sh /
EXPOSE 80
ENTRYPOINT ["/entrypoint.sh"]
CMD ["traefik"]
# Metadata
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.3.8" \
org.label-schema.docker.schema-version="1.0" (which I've successfully tested on all three architectures) |
(Also, that |
Thank you for the review, we will resolve this quickly. |
@tianon we applied your suggestions.
|
@tianon I removed all arm32 for alpine. Is this correct now ? |
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index cd9d96e..e753729 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,4 +1,8 @@
+traefik:alpine @ amd64
traefik:latest @ amd64
-traefik:raclette-alpine @ amd64
+traefik:latest @ arm32v6
+traefik:latest @ arm64v8
traefik:roquefort @ amd64
+traefik:roquefort @ arm32v6
+traefik:roquefort @ arm64v8
traefik:roquefort-alpine @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index bfb57cc..2e418c7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,11 +1,12 @@
traefik:1.3
traefik:1.3-alpine
-traefik:1.3.7
-traefik:1.3.7-alpine
+traefik:1.3.8
+traefik:1.3.8-alpine
traefik:1.4
traefik:1.4-alpine
-traefik:1.4.0-rc1
-traefik:1.4.0-rc1-alpine
+traefik:1.4.0-rc2
+traefik:1.4.0-rc2-alpine
+traefik:alpine
traefik:latest
traefik:raclette
traefik:raclette-alpine
@@ -13,9 +14,9 @@ traefik:roquefort
traefik:roquefort-alpine
traefik:v1.3
traefik:v1.3-alpine
-traefik:v1.3.7
-traefik:v1.3.7-alpine
+traefik:v1.3.8
+traefik:v1.3.8-alpine
traefik:v1.4
traefik:v1.4-alpine
-traefik:v1.4.0-rc1
-traefik:v1.4.0-rc1-alpine
+traefik:v1.4.0-rc2
+traefik:v1.4.0-rc2-alpine
diff --git a/traefik_roquefort-alpine/Dockerfile.tmpl b/traefik_alpine/Dockerfile
similarity index 27%
rename from traefik_roquefort-alpine/Dockerfile.tmpl
rename to traefik_alpine/Dockerfile
index 3c7c4c7..fac134b 100644
--- a/traefik_roquefort-alpine/Dockerfile.tmpl
+++ b/traefik_alpine/Dockerfile
@@ -1,17 +1,24 @@
FROM alpine:3.6
-RUN apk --update upgrade \
- && apk --no-cache --no-progress add ca-certificates \
- && rm -rf /var/cache/apk/*
-COPY traefik /usr/local/bin/
+RUN apk --no-cache add ca-certificates
+RUN set -ex; \
+ apkArch="$(apk --print-arch)"; \
+ case "$apkArch" in \
+ armhf) arch='arm' ;; \
+ aarch64) arch='arm64' ;; \
+ x86_64) arch='amd64' ;; \
+ *) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
+ esac; \
+ wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.3.8/traefik_linux-$arch"; \
+ chmod +x /usr/local/bin/traefik
COPY entrypoint.sh /
EXPOSE 80
ENTRYPOINT ["/entrypoint.sh"]
-CMD ["--help"]
+CMD ["traefik"]
# Metadata
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="$VERSION" \
- org.label-schema.docker.schema-version="1.0"
\ No newline at end of file
+ org.label-schema.description="A modern reverse-proxy" \
+ org.label-schema.version="v1.3.8" \
+ org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_raclette-alpine/entrypoint.sh b/traefik_alpine/entrypoint.sh
similarity index 100%
rename from traefik_raclette-alpine/entrypoint.sh
rename to traefik_alpine/entrypoint.sh
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index 2f1aa6d..d7c2b7b 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_latest/Dockerfile
@@ -8,6 +8,6 @@ ENTRYPOINT ["/traefik"]
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.3.7" \
- org.label-schema.docker.schema-version="1.0"
\ No newline at end of file
+ org.label-schema.description="A modern reverse-proxy" \
+ org.label-schema.version="v1.3.8" \
+ org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_latest/Dockerfile.tmpl b/traefik_latest/Dockerfile.tmpl
deleted file mode 100644
index 8fd822c..0000000
diff --git a/traefik_latest/traefik b/traefik_latest/traefik
index 1d991b2..409bfa7 100755
Binary files a/traefik_latest/traefik and b/traefik_latest/traefik differ
diff --git a/traefik_raclette-alpine/Dockerfile b/traefik_raclette-alpine/Dockerfile
deleted file mode 100644
index b64d32b..0000000
diff --git a/traefik_raclette-alpine/Dockerfile.tmpl b/traefik_raclette-alpine/Dockerfile.tmpl
deleted file mode 100644
index a34e53b..0000000
diff --git a/traefik_raclette-alpine/traefik b/traefik_raclette-alpine/traefik
deleted file mode 100755
index 1d991b2..0000000
diff --git a/traefik_roquefort-alpine/Dockerfile b/traefik_roquefort-alpine/Dockerfile
index a09b17e..3671179 100644
--- a/traefik_roquefort-alpine/Dockerfile
+++ b/traefik_roquefort-alpine/Dockerfile
@@ -1,17 +1,24 @@
FROM alpine:3.6
-RUN apk --update upgrade \
- && apk --no-cache --no-progress add ca-certificates \
- && rm -rf /var/cache/apk/*
-COPY traefik /usr/local/bin/
+RUN apk --no-cache add ca-certificates
+RUN set -ex; \
+ apkArch="$(apk --print-arch)"; \
+ case "$apkArch" in \
+ armhf) arch='arm' ;; \
+ aarch64) arch='arm64' ;; \
+ x86_64) arch='amd64' ;; \
+ *) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
+ esac; \
+ wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.4.0-rc2/traefik_linux-$arch"; \
+ chmod +x /usr/local/bin/traefik
COPY entrypoint.sh /
EXPOSE 80
ENTRYPOINT ["/entrypoint.sh"]
-CMD ["--help"]
+CMD ["traefik"]
# Metadata
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-rc1" \
- org.label-schema.docker.schema-version="1.0"
\ No newline at end of file
+ org.label-schema.description="A modern reverse-proxy" \
+ org.label-schema.version="v1.4.0-rc2" \
+ org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_roquefort-alpine/traefik b/traefik_roquefort-alpine/traefik
deleted file mode 100755
index 5213725..0000000
diff --git a/traefik_roquefort/Dockerfile b/traefik_roquefort/Dockerfile
index b5de03a..bb94523 100644
--- a/traefik_roquefort/Dockerfile
+++ b/traefik_roquefort/Dockerfile
@@ -8,6 +8,6 @@ ENTRYPOINT ["/traefik"]
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-rc1" \
- org.label-schema.docker.schema-version="1.0"
\ No newline at end of file
+ org.label-schema.description="A modern reverse-proxy" \
+ org.label-schema.version="v1.4.0-rc2" \
+ org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_roquefort/Dockerfile.tmpl b/traefik_roquefort/Dockerfile.tmpl
deleted file mode 100644
index 8fd822c..0000000
diff --git a/traefik_roquefort/traefik b/traefik_roquefort/traefik
index 5213725..96a9a33 100755
Binary files a/traefik_roquefort/traefik and b/traefik_roquefort/traefik differ |
OMG I swear I pasted the most up-to-date version of my testing FROM alpine:3.6
RUN apk --no-cache add ca-certificates
RUN set -ex; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
armhf) arch='arm' ;; \
aarch64) arch='arm64' ;; \
x86_64) arch='amd64' ;; \
*) 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.3.8/traefik_linux-$arch"; \
apk del .fetch-deps; \
chmod +x /usr/local/bin/traefik
COPY entrypoint.sh /
EXPOSE 80
ENTRYPOINT ["/entrypoint.sh"]
CMD ["traefik"]
# Metadata
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.3.8" \
org.label-schema.docker.schema-version="1.0" (missing the |
I will fix that right now |
libressl added! |
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index cd9d96e..e753729 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,4 +1,8 @@
+traefik:alpine @ amd64
traefik:latest @ amd64
-traefik:raclette-alpine @ amd64
+traefik:latest @ arm32v6
+traefik:latest @ arm64v8
traefik:roquefort @ amd64
+traefik:roquefort @ arm32v6
+traefik:roquefort @ arm64v8
traefik:roquefort-alpine @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index bfb57cc..2e418c7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,11 +1,12 @@
traefik:1.3
traefik:1.3-alpine
-traefik:1.3.7
-traefik:1.3.7-alpine
+traefik:1.3.8
+traefik:1.3.8-alpine
traefik:1.4
traefik:1.4-alpine
-traefik:1.4.0-rc1
-traefik:1.4.0-rc1-alpine
+traefik:1.4.0-rc2
+traefik:1.4.0-rc2-alpine
+traefik:alpine
traefik:latest
traefik:raclette
traefik:raclette-alpine
@@ -13,9 +14,9 @@ traefik:roquefort
traefik:roquefort-alpine
traefik:v1.3
traefik:v1.3-alpine
-traefik:v1.3.7
-traefik:v1.3.7-alpine
+traefik:v1.3.8
+traefik:v1.3.8-alpine
traefik:v1.4
traefik:v1.4-alpine
-traefik:v1.4.0-rc1
-traefik:v1.4.0-rc1-alpine
+traefik:v1.4.0-rc2
+traefik:v1.4.0-rc2-alpine
diff --git a/traefik_roquefort-alpine/Dockerfile.tmpl b/traefik_alpine/Dockerfile
similarity index 24%
rename from traefik_roquefort-alpine/Dockerfile.tmpl
rename to traefik_alpine/Dockerfile
index 3c7c4c7..52615b3 100644
--- a/traefik_roquefort-alpine/Dockerfile.tmpl
+++ b/traefik_alpine/Dockerfile
@@ -1,17 +1,26 @@
FROM alpine:3.6
-RUN apk --update upgrade \
- && apk --no-cache --no-progress add ca-certificates \
- && rm -rf /var/cache/apk/*
-COPY traefik /usr/local/bin/
+RUN apk --no-cache add ca-certificates
+RUN set -ex; \
+ apkArch="$(apk --print-arch)"; \
+ case "$apkArch" in \
+ armhf) arch='arm' ;; \
+ aarch64) arch='arm64' ;; \
+ x86_64) arch='amd64' ;; \
+ *) 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.3.8/traefik_linux-$arch"; \
+ apk del .fetch-deps; \
+ chmod +x /usr/local/bin/traefik
COPY entrypoint.sh /
EXPOSE 80
ENTRYPOINT ["/entrypoint.sh"]
-CMD ["--help"]
+CMD ["traefik"]
# Metadata
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="$VERSION" \
- org.label-schema.docker.schema-version="1.0"
\ No newline at end of file
+ org.label-schema.description="A modern reverse-proxy" \
+ org.label-schema.version="v1.3.8" \
+ org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_raclette-alpine/entrypoint.sh b/traefik_alpine/entrypoint.sh
similarity index 100%
rename from traefik_raclette-alpine/entrypoint.sh
rename to traefik_alpine/entrypoint.sh
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index 2f1aa6d..d7c2b7b 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_latest/Dockerfile
@@ -8,6 +8,6 @@ ENTRYPOINT ["/traefik"]
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.3.7" \
- org.label-schema.docker.schema-version="1.0"
\ No newline at end of file
+ org.label-schema.description="A modern reverse-proxy" \
+ org.label-schema.version="v1.3.8" \
+ org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_latest/Dockerfile.tmpl b/traefik_latest/Dockerfile.tmpl
deleted file mode 100644
index 8fd822c..0000000
diff --git a/traefik_latest/traefik b/traefik_latest/traefik
index 1d991b2..409bfa7 100755
Binary files a/traefik_latest/traefik and b/traefik_latest/traefik differ
diff --git a/traefik_raclette-alpine/Dockerfile b/traefik_raclette-alpine/Dockerfile
deleted file mode 100644
index b64d32b..0000000
diff --git a/traefik_raclette-alpine/Dockerfile.tmpl b/traefik_raclette-alpine/Dockerfile.tmpl
deleted file mode 100644
index a34e53b..0000000
diff --git a/traefik_raclette-alpine/traefik b/traefik_raclette-alpine/traefik
deleted file mode 100755
index 1d991b2..0000000
diff --git a/traefik_roquefort-alpine/Dockerfile b/traefik_roquefort-alpine/Dockerfile
index a09b17e..5e47d74 100644
--- a/traefik_roquefort-alpine/Dockerfile
+++ b/traefik_roquefort-alpine/Dockerfile
@@ -1,17 +1,26 @@
FROM alpine:3.6
-RUN apk --update upgrade \
- && apk --no-cache --no-progress add ca-certificates \
- && rm -rf /var/cache/apk/*
-COPY traefik /usr/local/bin/
+RUN apk --no-cache add ca-certificates
+RUN set -ex; \
+ apkArch="$(apk --print-arch)"; \
+ case "$apkArch" in \
+ armhf) arch='arm' ;; \
+ aarch64) arch='arm64' ;; \
+ x86_64) arch='amd64' ;; \
+ *) 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"; \
+ apk del .fetch-deps; \
+ chmod +x /usr/local/bin/traefik
COPY entrypoint.sh /
EXPOSE 80
ENTRYPOINT ["/entrypoint.sh"]
-CMD ["--help"]
+CMD ["traefik"]
# Metadata
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-rc1" \
- org.label-schema.docker.schema-version="1.0"
\ No newline at end of file
+ org.label-schema.description="A modern reverse-proxy" \
+ org.label-schema.version="v1.4.0-rc2" \
+ org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_roquefort-alpine/traefik b/traefik_roquefort-alpine/traefik
deleted file mode 100755
index 5213725..0000000
diff --git a/traefik_roquefort/Dockerfile b/traefik_roquefort/Dockerfile
index b5de03a..bb94523 100644
--- a/traefik_roquefort/Dockerfile
+++ b/traefik_roquefort/Dockerfile
@@ -8,6 +8,6 @@ ENTRYPOINT ["/traefik"]
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-rc1" \
- org.label-schema.docker.schema-version="1.0"
\ No newline at end of file
+ org.label-schema.description="A modern reverse-proxy" \
+ org.label-schema.version="v1.4.0-rc2" \
+ org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_roquefort/Dockerfile.tmpl b/traefik_roquefort/Dockerfile.tmpl
deleted file mode 100644
index 8fd822c..0000000
diff --git a/traefik_roquefort/traefik b/traefik_roquefort/traefik
index 5213725..96a9a33 100755
Binary files a/traefik_roquefort/traefik and b/traefik_roquefort/traefik differ Build test of #3426; 728ff31 ( $ bashbrew build traefik:v1.4.0-rc2
Building bashbrew/cache:4f2ba533887743707d8457ea06509f9299756b1562afa36e3f2e0b66f7479967 (traefik:v1.4.0-rc2)
Tagging traefik:v1.4.0-rc2
Tagging traefik:1.4.0-rc2
Tagging traefik:v1.4
Tagging traefik:1.4
Tagging traefik:roquefort
$ test/run.sh traefik:v1.4.0-rc2
testing traefik:v1.4.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.4.0-rc2-alpine
Building bashbrew/cache:12bb05da5b26e61de4ff387248167f24a8141f0355693b3bcbc35750c4326a31 (traefik:v1.4.0-rc2-alpine)
Tagging traefik:v1.4.0-rc2-alpine
Tagging traefik:1.4.0-rc2-alpine
Tagging traefik:v1.4-alpine
Tagging traefik:1.4-alpine
Tagging traefik:roquefort-alpine
$ test/run.sh traefik:v1.4.0-rc2-alpine
testing traefik:v1.4.0-rc2-alpine
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...passed
$ bashbrew build traefik:v1.3.8
Building 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
Building 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
|
Hello,
This PR updates Traefik to v1.3.8 & v1.4.0-rc2.
/cc @vdemeester @emilevauge
Cheers