Bump Traefik to v2.0.0-rc1 #6541
Merged
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
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 696b77b..a29ef6f 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,14 +1,14 @@
traefik:alpine @ amd64
traefik:alpine @ arm32v6
traefik:alpine @ arm64v8
-traefik:faisselle @ amd64
-traefik:faisselle @ arm32v6
-traefik:faisselle @ arm64v8
-traefik:faisselle-alpine @ amd64
-traefik:faisselle-alpine @ arm32v6
-traefik:faisselle-alpine @ arm64v8
-traefik:faisselle-nanoserver-sac2016 @ windows-amd64
traefik:latest @ amd64
traefik:latest @ arm32v6
traefik:latest @ arm64v8
+traefik:montdor @ amd64
+traefik:montdor @ arm32v6
+traefik:montdor @ arm64v8
+traefik:montdor-alpine @ amd64
+traefik:montdor-alpine @ arm32v6
+traefik:montdor-alpine @ arm64v8
+traefik:montdor-nanoserver-sac2016 @ windows-amd64
traefik:nanoserver-sac2016 @ windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 473d470..b9481da 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,20 +10,20 @@ traefik:2.0
traefik:2.0-alpine
traefik:2.0-nanoserver
traefik:2.0-nanoserver-sac2016
-traefik:2.0.0-beta1
-traefik:2.0.0-beta1-alpine
-traefik:2.0.0-beta1-nanoserver
-traefik:2.0.0-beta1-nanoserver-sac2016
+traefik:2.0.0-rc1
+traefik:2.0.0-rc1-alpine
+traefik:2.0.0-rc1-nanoserver
+traefik:2.0.0-rc1-nanoserver-sac2016
traefik:alpine
-traefik:faisselle
-traefik:faisselle-alpine
-traefik:faisselle-nanoserver
-traefik:faisselle-nanoserver-sac2016
traefik:latest
traefik:maroilles
traefik:maroilles-alpine
traefik:maroilles-nanoserver
traefik:maroilles-nanoserver-sac2016
+traefik:montdor
+traefik:montdor-alpine
+traefik:montdor-nanoserver
+traefik:montdor-nanoserver-sac2016
traefik:nanoserver
traefik:nanoserver-sac2016
traefik:v1.7
@@ -38,7 +38,7 @@ traefik:v2.0
traefik:v2.0-alpine
traefik:v2.0-nanoserver
traefik:v2.0-nanoserver-sac2016
-traefik:v2.0.0-beta1
-traefik:v2.0.0-beta1-alpine
-traefik:v2.0.0-beta1-nanoserver
-traefik:v2.0.0-beta1-nanoserver-sac2016
+traefik:v2.0.0-rc1
+traefik:v2.0.0-rc1-alpine
+traefik:v2.0.0-rc1-nanoserver
+traefik:v2.0.0-rc1-nanoserver-sac2016
diff --git a/traefik_faisselle-nanoserver-sac2016/Dockerfile b/traefik_faisselle-nanoserver-sac2016/Dockerfile
deleted file mode 100644
index afdea45..0000000
diff --git a/traefik_faisselle-nanoserver-sac2016/traefik.exe b/traefik_faisselle-nanoserver-sac2016/traefik.exe
deleted file mode 100755
index ecbac40..0000000
diff --git a/traefik_faisselle/Dockerfile b/traefik_faisselle/Dockerfile
deleted file mode 100644
index 04c7a7f..0000000
diff --git a/traefik_faisselle/certs/ca-certificates.crt b/traefik_faisselle/certs/ca-certificates.crt
deleted file mode 100644
index a4e2acc..0000000
diff --git a/traefik_faisselle/traefik b/traefik_faisselle/traefik
deleted file mode 100755
index 2f7e83b..0000000
diff --git a/traefik_faisselle-alpine/Dockerfile b/traefik_montdor-alpine/Dockerfile
similarity index 60%
copy from traefik_faisselle-alpine/Dockerfile
copy to traefik_montdor-alpine/Dockerfile
index 3c745d8..adf5e30 100644
--- a/traefik_faisselle-alpine/Dockerfile
+++ b/traefik_montdor-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
RUN apk --no-cache add ca-certificates tzdata
RUN set -ex; \
apkArch="$(apk --print-arch)"; \
@@ -8,7 +8,7 @@ RUN set -ex; \
x86_64) arch='amd64' ;; \
*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
esac; \
- wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.0.0-beta1/traefik_v2.0.0-beta1_linux_$arch.tar.gz"; \
+ wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.0.0-rc1/traefik_v2.0.0-rc1_linux_$arch.tar.gz"; \
tar xzvf /tmp/traefik.tar.gz -C /usr/local/bin traefik; \
rm -f /tmp/traefik.tar.gz; \
chmod +x /usr/local/bin/traefik
@@ -22,5 +22,5 @@ LABEL org.opencontainers.image.vendor="Containous" \
org.opencontainers.image.url="https://traefik.io" \
org.opencontainers.image.title="Traefik" \
org.opencontainers.image.description="A modern reverse-proxy" \
- org.opencontainers.image.version="v2.0.0-beta1" \
+ org.opencontainers.image.version="v2.0.0-rc1" \
org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_faisselle-alpine/entrypoint.sh b/traefik_montdor-alpine/entrypoint.sh
similarity index 100%
rename from traefik_faisselle-alpine/entrypoint.sh
rename to traefik_montdor-alpine/entrypoint.sh
diff --git a/traefik_montdor-nanoserver-sac2016/Dockerfile b/traefik_montdor-nanoserver-sac2016/Dockerfile
new file mode 100644
index 0000000..19cbc70
--- /dev/null
+++ b/traefik_montdor-nanoserver-sac2016/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/nanoserver:sac2016
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+RUN Invoke-WebRequest \
+ -Uri "https://github.com/containous/traefik/releases/download/v2.0.0-rc1/traefik_v2.0.0-rc1_windows_amd64.zip" \
+ -OutFile "/traefik.zip" ; \
+ Expand-Archive -Path "/traefik.zip" -DestinationPath "/" -Force ; \
+ Remove-Item –path /traefik.zip
+
+EXPOSE 80
+ENTRYPOINT ["/traefik"]
+
+# Metadata
+LABEL org.opencontainers.image.vendor="Containous" \
+ org.opencontainers.image.url="https://traefik.io" \
+ org.opencontainers.image.title="Traefik" \
+ org.opencontainers.image.description="A modern reverse-proxy" \
+ org.opencontainers.image.version="v2.0.0-rc1" \
+ org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_faisselle-alpine/Dockerfile b/traefik_montdor/Dockerfile
similarity index 42%
rename from traefik_faisselle-alpine/Dockerfile
rename to traefik_montdor/Dockerfile
index 3c745d8..70e5d1e 100644
--- a/traefik_faisselle-alpine/Dockerfile
+++ b/traefik_montdor/Dockerfile
@@ -1,5 +1,5 @@
-FROM alpine:3.9
-RUN apk --no-cache add ca-certificates tzdata
+FROM alpine:3.10 as core
+RUN apk --no-cache add ca-certificates tzdata && update-ca-certificates
RUN set -ex; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
@@ -8,19 +8,23 @@ RUN set -ex; \
x86_64) arch='amd64' ;; \
*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
esac; \
- wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.0.0-beta1/traefik_v2.0.0-beta1_linux_$arch.tar.gz"; \
+ wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.0.0-rc1/traefik_v2.0.0-rc1_linux_$arch.tar.gz"; \
tar xzvf /tmp/traefik.tar.gz -C /usr/local/bin traefik; \
rm -f /tmp/traefik.tar.gz; \
chmod +x /usr/local/bin/traefik
-COPY entrypoint.sh /
+
+FROM scratch
+COPY --from=core /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=core /usr/share/zoneinfo /usr/share/
+COPY --from=core /usr/local/bin/traefik /
EXPOSE 80
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["traefik"]
+VOLUME ["/tmp"]
+ENTRYPOINT ["/traefik"]
# Metadata
LABEL org.opencontainers.image.vendor="Containous" \
org.opencontainers.image.url="https://traefik.io" \
org.opencontainers.image.title="Traefik" \
org.opencontainers.image.description="A modern reverse-proxy" \
- org.opencontainers.image.version="v2.0.0-beta1" \
+ org.opencontainers.image.version="v2.0.0-rc1" \
org.opencontainers.image.documentation="https://docs.traefik.io" |
|
The new multi-stage build doesn't fit either of the guidelines in the faq. If it was traefik v2.0-alpine 39632a526b6e 5 weeks ago 68.9MB
traefik 2.0 f375581018a8 5 weeks ago 61.7MB |
|
@yosifkit I updated the PR, could you take another look. |
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 696b77b..a29ef6f 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,14 +1,14 @@
traefik:alpine @ amd64
traefik:alpine @ arm32v6
traefik:alpine @ arm64v8
-traefik:faisselle @ amd64
-traefik:faisselle @ arm32v6
-traefik:faisselle @ arm64v8
-traefik:faisselle-alpine @ amd64
-traefik:faisselle-alpine @ arm32v6
-traefik:faisselle-alpine @ arm64v8
-traefik:faisselle-nanoserver-sac2016 @ windows-amd64
traefik:latest @ amd64
traefik:latest @ arm32v6
traefik:latest @ arm64v8
+traefik:montdor @ amd64
+traefik:montdor @ arm32v6
+traefik:montdor @ arm64v8
+traefik:montdor-alpine @ amd64
+traefik:montdor-alpine @ arm32v6
+traefik:montdor-alpine @ arm64v8
+traefik:montdor-nanoserver-sac2016 @ windows-amd64
traefik:nanoserver-sac2016 @ windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 473d470..b9481da 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,20 +10,20 @@ traefik:2.0
traefik:2.0-alpine
traefik:2.0-nanoserver
traefik:2.0-nanoserver-sac2016
-traefik:2.0.0-beta1
-traefik:2.0.0-beta1-alpine
-traefik:2.0.0-beta1-nanoserver
-traefik:2.0.0-beta1-nanoserver-sac2016
+traefik:2.0.0-rc1
+traefik:2.0.0-rc1-alpine
+traefik:2.0.0-rc1-nanoserver
+traefik:2.0.0-rc1-nanoserver-sac2016
traefik:alpine
-traefik:faisselle
-traefik:faisselle-alpine
-traefik:faisselle-nanoserver
-traefik:faisselle-nanoserver-sac2016
traefik:latest
traefik:maroilles
traefik:maroilles-alpine
traefik:maroilles-nanoserver
traefik:maroilles-nanoserver-sac2016
+traefik:montdor
+traefik:montdor-alpine
+traefik:montdor-nanoserver
+traefik:montdor-nanoserver-sac2016
traefik:nanoserver
traefik:nanoserver-sac2016
traefik:v1.7
@@ -38,7 +38,7 @@ traefik:v2.0
traefik:v2.0-alpine
traefik:v2.0-nanoserver
traefik:v2.0-nanoserver-sac2016
-traefik:v2.0.0-beta1
-traefik:v2.0.0-beta1-alpine
-traefik:v2.0.0-beta1-nanoserver
-traefik:v2.0.0-beta1-nanoserver-sac2016
+traefik:v2.0.0-rc1
+traefik:v2.0.0-rc1-alpine
+traefik:v2.0.0-rc1-nanoserver
+traefik:v2.0.0-rc1-nanoserver-sac2016
diff --git a/traefik_faisselle-nanoserver-sac2016/Dockerfile b/traefik_faisselle-nanoserver-sac2016/Dockerfile
deleted file mode 100644
index afdea45..0000000
diff --git a/traefik_faisselle-nanoserver-sac2016/traefik.exe b/traefik_faisselle-nanoserver-sac2016/traefik.exe
deleted file mode 100755
index ecbac40..0000000
diff --git a/traefik_faisselle/certs/ca-certificates.crt b/traefik_faisselle/certs/ca-certificates.crt
deleted file mode 100644
index a4e2acc..0000000
diff --git a/traefik_faisselle/traefik b/traefik_faisselle/traefik
deleted file mode 100755
index 2f7e83b..0000000
diff --git a/traefik_faisselle-alpine/Dockerfile b/traefik_montdor-alpine/Dockerfile
similarity index 60%
rename from traefik_faisselle-alpine/Dockerfile
rename to traefik_montdor-alpine/Dockerfile
index 3c745d8..adf5e30 100644
--- a/traefik_faisselle-alpine/Dockerfile
+++ b/traefik_montdor-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
RUN apk --no-cache add ca-certificates tzdata
RUN set -ex; \
apkArch="$(apk --print-arch)"; \
@@ -8,7 +8,7 @@ RUN set -ex; \
x86_64) arch='amd64' ;; \
*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
esac; \
- wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.0.0-beta1/traefik_v2.0.0-beta1_linux_$arch.tar.gz"; \
+ wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.0.0-rc1/traefik_v2.0.0-rc1_linux_$arch.tar.gz"; \
tar xzvf /tmp/traefik.tar.gz -C /usr/local/bin traefik; \
rm -f /tmp/traefik.tar.gz; \
chmod +x /usr/local/bin/traefik
@@ -22,5 +22,5 @@ LABEL org.opencontainers.image.vendor="Containous" \
org.opencontainers.image.url="https://traefik.io" \
org.opencontainers.image.title="Traefik" \
org.opencontainers.image.description="A modern reverse-proxy" \
- org.opencontainers.image.version="v2.0.0-beta1" \
+ org.opencontainers.image.version="v2.0.0-rc1" \
org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_faisselle-alpine/entrypoint.sh b/traefik_montdor-alpine/entrypoint.sh
similarity index 100%
rename from traefik_faisselle-alpine/entrypoint.sh
rename to traefik_montdor-alpine/entrypoint.sh
diff --git a/traefik_montdor-nanoserver-sac2016/Dockerfile b/traefik_montdor-nanoserver-sac2016/Dockerfile
new file mode 100644
index 0000000..19cbc70
--- /dev/null
+++ b/traefik_montdor-nanoserver-sac2016/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/nanoserver:sac2016
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+RUN Invoke-WebRequest \
+ -Uri "https://github.com/containous/traefik/releases/download/v2.0.0-rc1/traefik_v2.0.0-rc1_windows_amd64.zip" \
+ -OutFile "/traefik.zip" ; \
+ Expand-Archive -Path "/traefik.zip" -DestinationPath "/" -Force ; \
+ Remove-Item –path /traefik.zip
+
+EXPOSE 80
+ENTRYPOINT ["/traefik"]
+
+# Metadata
+LABEL org.opencontainers.image.vendor="Containous" \
+ org.opencontainers.image.url="https://traefik.io" \
+ org.opencontainers.image.title="Traefik" \
+ org.opencontainers.image.description="A modern reverse-proxy" \
+ org.opencontainers.image.version="v2.0.0-rc1" \
+ org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_faisselle/Dockerfile b/traefik_montdor/Dockerfile
similarity index 20%
rename from traefik_faisselle/Dockerfile
rename to traefik_montdor/Dockerfile
index 04c7a7f..d66487a 100644
--- a/traefik_faisselle/Dockerfile
+++ b/traefik_montdor/Dockerfile
@@ -1,6 +1,8 @@
FROM scratch
-COPY certs/ca-certificates.crt /etc/ssl/certs/
-COPY traefik /
+COPY --from=traefik:2.0.0-rc1-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=traefik:2.0.0-rc1-alpine /usr/share/zoneinfo /usr/share/
+COPY --from=traefik:2.0.0-rc1-alpine /usr/local/bin/traefik /
+
EXPOSE 80
VOLUME ["/tmp"]
ENTRYPOINT ["/traefik"]
@@ -10,5 +12,5 @@ LABEL org.opencontainers.image.vendor="Containous" \
org.opencontainers.image.url="https://traefik.io" \
org.opencontainers.image.title="Traefik" \
org.opencontainers.image.description="A modern reverse-proxy" \
- org.opencontainers.image.version="v2.0.0-beta1" \
+ org.opencontainers.image.version="v2.0.0-rc1" \
org.opencontainers.image.documentation="https://docs.traefik.io" |
|
Yes it is. It's not about the size, but the the fact that there is no other binary in the image. |
We're asking again because the last time we asked the answer was that you'll think about it. Honestly, I don't think the "single binary" story is really very compelling, but I'm not inclined to argue too hard. (I think |
|
Build test of #6541; c948858; $ bashbrew build traefik:v2.0.0-rc1-alpine
Building bashbrew/cache:49acd056587c1ff11878c31244007a1ccfb6f0397362902ed3961ccb55ccc282 (traefik:v2.0.0-rc1-alpine)
Tagging traefik:v2.0.0-rc1-alpine
Tagging traefik:2.0.0-rc1-alpine
Tagging traefik:v2.0-alpine
Tagging traefik:2.0-alpine
Tagging traefik:montdor-alpine
$ test/run.sh traefik:v2.0.0-rc1-alpine
testing traefik:v2.0.0-rc1-alpine
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...= 'echo' is not a Traefik command: assuming shell execution.
passed
$ bashbrew build traefik:v2.0.0-rc1-nanoserver
skipping "traefik:v2.0.0-rc1-nanoserver" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh traefik:v2.0.0-rc1-nanoserver
testing traefik:v2.0.0-rc1-nanoserver
image has no tests...skipping
$ bashbrew build traefik:v1.7.14
Using bashbrew/cache:79ee3af0626f04f7e60b364fa4a0c39f447366f19d42fac548c62cfc911bf9e8 (traefik:v1.7.14)
Tagging traefik:v1.7.14
Tagging traefik:1.7.14
Tagging traefik:v1.7
Tagging traefik:1.7
Tagging traefik:maroilles
Tagging traefik:latest
$ test/run.sh traefik:v1.7.14
testing traefik:v1.7.14
'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.14-alpine
Using bashbrew/cache:0a96f3735cfa0b8f11998939087b694a0a89e120a3980db1288a82dd07284738 (traefik:v1.7.14-alpine)
Tagging traefik:v1.7.14-alpine
Tagging traefik:1.7.14-alpine
Tagging traefik:v1.7-alpine
Tagging traefik:1.7-alpine
Tagging traefik:maroilles-alpine
Tagging traefik:alpine
$ test/run.sh traefik:v1.7.14-alpine
testing traefik:v1.7.14-alpine
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...= 'echo' is not a Traefik command: assuming shell execution.
passed
$ bashbrew build traefik:v1.7.14-nanoserver
skipping "traefik:v1.7.14-nanoserver" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh traefik:v1.7.14-nanoserver
testing traefik:v1.7.14-nanoserver
image has no tests...skipping
$ bashbrew build traefik:v2.0.0-rc1
Building bashbrew/cache:374ba0f8ec1aa89e3e6115cce095f74aa17d693179343fdd5d4264f8f2c4af52 (traefik:v2.0.0-rc1)
Tagging traefik:v2.0.0-rc1
Tagging traefik:2.0.0-rc1
Tagging traefik:v2.0
Tagging traefik:2.0
Tagging traefik:montdor
$ test/run.sh traefik:v2.0.0-rc1
testing traefik:v2.0.0-rc1
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed
|
2 tasks
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 v2.0.0-rc1.
/cc @mmatur @emilevauge @dtomcej
Cheers