Bump Traefik to v2.2.0 and v1.7.24 #7687
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 34f625c..5a36457 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,7 +1,3 @@
-traefik:chevrotin @ amd64
-traefik:chevrotin @ arm32v6
-traefik:chevrotin @ arm64v8
-traefik:chevrotin-windowsservercore-1809 @ windows-amd64
traefik:latest @ amd64
traefik:latest @ arm32v6
traefik:latest @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 1490691..acd8a12 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,19 +1,13 @@
traefik:1.7
traefik:1.7-alpine
traefik:1.7-windowsservercore-1809
-traefik:1.7.23
-traefik:1.7.23-alpine
-traefik:1.7.23-windowsservercore-1809
-traefik:2.1
-traefik:2.1-windowsservercore-1809
-traefik:2.1.9
-traefik:2.1.9-windowsservercore-1809
+traefik:1.7.24
+traefik:1.7.24-alpine
+traefik:1.7.24-windowsservercore-1809
traefik:2.2
traefik:2.2-windowsservercore-1809
-traefik:2.2.0-rc4
-traefik:2.2.0-rc4-windowsservercore-1809
-traefik:cantal
-traefik:cantal-windowsservercore-1809
+traefik:2.2.0
+traefik:2.2.0-windowsservercore-1809
traefik:chevrotin
traefik:chevrotin-windowsservercore-1809
traefik:latest
@@ -23,15 +17,11 @@ traefik:maroilles-windowsservercore-1809
traefik:v1.7
traefik:v1.7-alpine
traefik:v1.7-windowsservercore-1809
-traefik:v1.7.23
-traefik:v1.7.23-alpine
-traefik:v1.7.23-windowsservercore-1809
-traefik:v2.1
-traefik:v2.1-windowsservercore-1809
-traefik:v2.1.9
-traefik:v2.1.9-windowsservercore-1809
+traefik:v1.7.24
+traefik:v1.7.24-alpine
+traefik:v1.7.24-windowsservercore-1809
traefik:v2.2
traefik:v2.2-windowsservercore-1809
-traefik:v2.2.0-rc4
-traefik:v2.2.0-rc4-windowsservercore-1809
+traefik:v2.2.0
+traefik:v2.2.0-windowsservercore-1809
traefik:windowsservercore-1809
diff --git a/traefik_chevrotin-windowsservercore-1809/Dockerfile b/traefik_chevrotin-windowsservercore-1809/Dockerfile
deleted file mode 100644
index f1f50fa..0000000
diff --git a/traefik_chevrotin/Dockerfile b/traefik_chevrotin/Dockerfile
deleted file mode 100644
index 7e087e7..0000000
diff --git a/traefik_chevrotin/entrypoint.sh b/traefik_chevrotin/entrypoint.sh
deleted file mode 100755
index 72b0b69..0000000
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index 3f81bdc..0a0df48 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_latest/Dockerfile
@@ -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.1.9/traefik_v2.1.9_linux_$arch.tar.gz"; \
+ wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.2.0/traefik_v2.2.0_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.1.9" \
+ org.opencontainers.image.version="v2.2.0" \
org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_maroilles-alpine/Dockerfile b/traefik_maroilles-alpine/Dockerfile
index a473737..c000716 100644
--- a/traefik_maroilles-alpine/Dockerfile
+++ b/traefik_maroilles-alpine/Dockerfile
@@ -8,7 +8,7 @@ RUN set -ex; \
x86_64) arch='amd64' ;; \
*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
esac; \
- wget --quiet -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.7.23/traefik_linux-$arch"; \
+ wget --quiet -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.7.24/traefik_linux-$arch"; \
chmod +x /usr/local/bin/traefik
COPY entrypoint.sh /
EXPOSE 80
@@ -20,5 +20,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="v1.7.23" \
+ org.opencontainers.image.version="v1.7.24" \
org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_maroilles-windowsservercore-1809/Dockerfile b/traefik_maroilles-windowsservercore-1809/Dockerfile
index 6719ee2..d4b5e9f 100644
--- a/traefik_maroilles-windowsservercore-1809/Dockerfile
+++ b/traefik_maroilles-windowsservercore-1809/Dockerfile
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/windows/servercore:1809
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
RUN Invoke-WebRequest \
- -Uri "https://github.com/containous/traefik/releases/download/v1.7.23/traefik_windows-amd64.exe" \
+ -Uri "https://github.com/containous/traefik/releases/download/v1.7.24/traefik_windows-amd64.exe" \
-OutFile "/traefik.exe"
EXPOSE 80
@@ -14,5 +14,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="v1.7.23" \
+ org.opencontainers.image.version="v1.7.24" \
org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_maroilles/Dockerfile b/traefik_maroilles/Dockerfile
index 8cec539..777ba4a 100644
--- a/traefik_maroilles/Dockerfile
+++ b/traefik_maroilles/Dockerfile
@@ -1,7 +1,7 @@
FROM scratch
-COPY --from=traefik:v1.7.23-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=traefik:v1.7.23-alpine /usr/share/zoneinfo /usr/share/
-COPY --from=traefik:v1.7.23-alpine /usr/local/bin/traefik /
+COPY --from=traefik:v1.7.24-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=traefik:v1.7.24-alpine /usr/share/zoneinfo /usr/share/
+COPY --from=traefik:v1.7.24-alpine /usr/local/bin/traefik /
EXPOSE 80
VOLUME ["/tmp"]
@@ -12,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="v1.7.23" \
+ org.opencontainers.image.version="v1.7.24" \
org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_windowsservercore-1809/Dockerfile b/traefik_windowsservercore-1809/Dockerfile
index 9222b2f..3326d0f 100644
--- a/traefik_windowsservercore-1809/Dockerfile
+++ b/traefik_windowsservercore-1809/Dockerfile
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/windows/servercore:1809
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
RUN Invoke-WebRequest \
- -Uri "https://github.com/containous/traefik/releases/download/v2.1.9/traefik_v2.1.9_windows_amd64.zip" \
+ -Uri "https://github.com/containous/traefik/releases/download/v2.2.0/traefik_v2.2.0_windows_amd64.zip" \
-OutFile "/traefik.zip"; \
Expand-Archive -Path "/traefik.zip" -DestinationPath "/" -Force; \
Remove-Item "/traefik.zip" -Force
@@ -16,5 +16,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.1.9" \
+ org.opencontainers.image.version="v2.2.0" \
org.opencontainers.image.documentation="https://docs.traefik.io" |
|
Build test of #7687; 30a90f2; $ bashbrew build traefik:v2.2.0-windowsservercore-1809
skipping "traefik:v2.2.0-windowsservercore-1809" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh traefik:v2.2.0-windowsservercore-1809
testing traefik:v2.2.0-windowsservercore-1809
image has no tests...skipping
$ bashbrew build traefik:v2.2.0
Building bashbrew/cache:df3fc14143dcb4d0a63b61081e57c6c8331d2fee0e07e72c7beebdcab026ac7d (traefik:v2.2.0)
Tagging traefik:v2.2.0
Tagging traefik:2.2.0
Tagging traefik:v2.2
Tagging traefik:2.2
Tagging traefik:chevrotin
Tagging traefik:latest
$ test/run.sh traefik:v2.2.0
testing traefik:v2.2.0
'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.24-windowsservercore-1809
skipping "traefik:v1.7.24-windowsservercore-1809" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh traefik:v1.7.24-windowsservercore-1809
testing traefik:v1.7.24-windowsservercore-1809
image has no tests...skipping
$ bashbrew build traefik:v1.7.24-alpine
Building bashbrew/cache:31460f2382e4ece49d9de9d5a22196dd83f5ca41e39f0fec67b2d7368d93b105 (traefik:v1.7.24-alpine)
Tagging traefik:v1.7.24-alpine
Tagging traefik:1.7.24-alpine
Tagging traefik:v1.7-alpine
Tagging traefik:1.7-alpine
Tagging traefik:maroilles-alpine
$ test/run.sh traefik:v1.7.24-alpine
testing traefik:v1.7.24-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.24
Building bashbrew/cache:4e8dc3e290897264ebcf0ca7e13aecce550b441b0b2242e8d3c35e9ccf1bae9a (traefik:v1.7.24)
Tagging traefik:v1.7.24
Tagging traefik:1.7.24
Tagging traefik:v1.7
Tagging traefik:1.7
Tagging traefik:maroilles
$ test/run.sh traefik:v1.7.24
testing traefik:v1.7.24
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed
|
ldez
deleted the
traefik-new-version-6dcd8fe17189e8076ee052a614dda5550afb2930
branch
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:
/cc @mmatur @emilevauge @SantoDE @dtomcej
Cheers