-
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 v2.6.0 #11732
Merged
yosifkit
merged 1 commit into
docker-library:master
from
rtribotte:traefik-new-version-333cb722775df31365a41baf164b00a032083a57
Jan 24, 2022
Merged
Bump Traefik to v2.6.0 #11732
yosifkit
merged 1 commit into
docker-library:master
from
rtribotte:traefik-new-version-333cb722775df31365a41baf164b00a032083a57
Jan 24, 2022
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 for 18f2555:diff --git a/_bashbrew-cat b/_bashbrew-cat
index abc5e4d..d8bd170 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -13,29 +13,16 @@ GitCommit: 4434758cf14bbd1ec9511b3f2a37b0a6ce846db6
Directory: windows/1809
Constraints: windowsservercore-1809
-Tags: v2.5.7, 2.5.7, v2.5, 2.5, brie, latest
+Tags: v2.6.0, 2.6.0, v2.6, 2.6, rocamadour, latest
Architectures: amd64, arm32v6, arm64v8
GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: a76bd42fe369759cd9c14abd3855dd24461c7ab8
+GitCommit: 333cb722775df31365a41baf164b00a032083a57
Directory: alpine
-Tags: v2.5.7-windowsservercore-1809, 2.5.7-windowsservercore-1809, v2.5-windowsservercore-1809, 2.5-windowsservercore-1809, brie-windowsservercore-1809, windowsservercore-1809
+Tags: v2.6.0-windowsservercore-1809, 2.6.0-windowsservercore-1809, v2.6-windowsservercore-1809, 2.6-windowsservercore-1809, rocamadour-windowsservercore-1809, windowsservercore-1809
Architectures: windows-amd64
GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: a76bd42fe369759cd9c14abd3855dd24461c7ab8
-Directory: windows/1809
-Constraints: windowsservercore-1809
-
-Tags: v2.6.0-rc3, 2.6.0-rc3, v2.6, 2.6, rocamadour
-Architectures: amd64, arm32v6, arm64v8
-GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 257abf1b31c2962fa25330465400c4b16a06d687
-Directory: alpine
-
-Tags: v2.6.0-rc3-windowsservercore-1809, 2.6.0-rc3-windowsservercore-1809, v2.6-windowsservercore-1809, 2.6-windowsservercore-1809, rocamadour-windowsservercore-1809
-Architectures: windows-amd64
-GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 257abf1b31c2962fa25330465400c4b16a06d687
+GitCommit: 333cb722775df31365a41baf164b00a032083a57
Directory: windows/1809
Constraints: windowsservercore-1809
diff --git a/_bashbrew-list b/_bashbrew-list
index 6a94820..54733d3 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,16 +4,10 @@ traefik:1.7-windowsservercore-1809
traefik:1.7.34
traefik:1.7.34-alpine
traefik:1.7.34-windowsservercore-1809
-traefik:2.5
-traefik:2.5-windowsservercore-1809
-traefik:2.5.7
-traefik:2.5.7-windowsservercore-1809
traefik:2.6
traefik:2.6-windowsservercore-1809
-traefik:2.6.0-rc3
-traefik:2.6.0-rc3-windowsservercore-1809
-traefik:brie
-traefik:brie-windowsservercore-1809
+traefik:2.6.0
+traefik:2.6.0-windowsservercore-1809
traefik:latest
traefik:maroilles
traefik:maroilles-alpine
@@ -26,12 +20,8 @@ traefik:v1.7-windowsservercore-1809
traefik:v1.7.34
traefik:v1.7.34-alpine
traefik:v1.7.34-windowsservercore-1809
-traefik:v2.5
-traefik:v2.5-windowsservercore-1809
-traefik:v2.5.7
-traefik:v2.5.7-windowsservercore-1809
traefik:v2.6
traefik:v2.6-windowsservercore-1809
-traefik:v2.6.0-rc3
-traefik:v2.6.0-rc3-windowsservercore-1809
+traefik:v2.6.0
+traefik:v2.6.0-windowsservercore-1809
traefik:windowsservercore-1809
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index a01a9be..990fd7c 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/traefik/traefik/releases/download/v2.5.7/traefik_v2.5.7_linux_$arch.tar.gz"; \
+ wget --quiet -O /tmp/traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v2.6.0/traefik_v2.6.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="Traefik Labs" \
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.5.7" \
+ org.opencontainers.image.version="v2.6.0" \
org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_rocamadour-windowsservercore-1809/Dockerfile b/traefik_rocamadour-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 773f2a5..0000000
diff --git a/traefik_rocamadour/Dockerfile b/traefik_rocamadour/Dockerfile
deleted file mode 100644
index 8ea3c8e..0000000
diff --git a/traefik_rocamadour/entrypoint.sh b/traefik_rocamadour/entrypoint.sh
deleted file mode 100755
index 72b0b69..0000000
diff --git a/traefik_windowsservercore-1809/Dockerfile b/traefik_windowsservercore-1809/Dockerfile
index d466dff..f4c4a50 100644
--- a/traefik_windowsservercore-1809/Dockerfile
+++ b/traefik_windowsservercore-1809/Dockerfile
@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/windows/servercore:1809
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
RUN Invoke-WebRequest \
- -Uri "https://github.com/traefik/traefik/releases/download/v2.5.7/traefik_v2.5.7_windows_amd64.zip" \
+ -Uri "https://github.com/traefik/traefik/releases/download/v2.6.0/traefik_v2.6.0_windows_amd64.zip" \
-OutFile "/traefik.zip"; \
Expand-Archive -Path "/traefik.zip" -DestinationPath "/" -Force; \
Remove-Item "/traefik.zip" -Force
@@ -15,5 +15,5 @@ LABEL org.opencontainers.image.vendor="Traefik Labs" \
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.5.7" \
+ org.opencontainers.image.version="v2.6.0" \
org.opencontainers.image.documentation="https://docs.traefik.io" Relevant Maintainers:
|
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.6.0.
/cc @mpl @kevinpollet @ldez
Cheers