Skip to content
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 v3.1.0 #17180

Conversation

rtribotte
Copy link
Contributor

Hello,

This PR updates Traefik to v3.1.0.

/cc @mmatur @kevinpollet

Cheers

@rtribotte rtribotte requested a review from a team as a code owner July 15, 2024 15:29
Copy link

Diff for a21477c:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 04e5e43..71de496 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -27,56 +27,29 @@ GitCommit: 1e50ba91255ec5269abb2bf117a21e5ae7ffe2a9
 Directory: v2.11/windows/servercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: v3.0.4, 3.0.4, v3.0, 3.0, beaufort, latest
+Tags: v3.1.0, 3.1.0, v3.1, 3.1, comte, latest
 Architectures: amd64, arm32v6, arm64v8, ppc64le, riscv64, s390x
 GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 10af0cbf05f6af64df7062738a2d612bd95a5e3b
-Directory: v3.0/alpine
-
-Tags: v3.0.4-nanoserver-ltsc2022, 3.0.4-nanoserver-ltsc2022, v3.0-nanoserver-ltsc2022, 3.0-nanoserver-ltsc2022, beaufort-nanoserver-ltsc2022, nanoserver-ltsc2022
-Architectures: windows-amd64
-GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 10af0cbf05f6af64df7062738a2d612bd95a5e3b
-Directory: v3.0/windows/nanoserver-ltsc2022
-Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
-
-Tags: v3.0.4-windowsservercore-1809, 3.0.4-windowsservercore-1809, v3.0-windowsservercore-1809, 3.0-windowsservercore-1809, beaufort-windowsservercore-1809, windowsservercore-1809
-Architectures: windows-amd64
-GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 10af0cbf05f6af64df7062738a2d612bd95a5e3b
-Directory: v3.0/windows/1809
-Constraints: windowsservercore-1809
-
-Tags: v3.0.4-windowsservercore-ltsc2022, 3.0.4-windowsservercore-ltsc2022, v3.0-windowsservercore-ltsc2022, 3.0-windowsservercore-ltsc2022, beaufort-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-Architectures: windows-amd64
-GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 10af0cbf05f6af64df7062738a2d612bd95a5e3b
-Directory: v3.0/windows/servercore-ltsc2022
-Constraints: windowsservercore-ltsc2022
-
-Tags: v3.1.0-rc3, 3.1.0-rc3, v3.1, 3.1, comte
-Architectures: amd64, arm32v6, arm64v8, ppc64le, riscv64, s390x
-GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 30b5ca403f1a1caef4c6b91112616eec405c4d95
+GitCommit: 2f8afc4591f5faf2b4ec8279ed8128ffbb919e41
 Directory: v3.1/alpine
 
-Tags: v3.1.0-rc3-nanoserver-ltsc2022, 3.1.0-rc3-nanoserver-ltsc2022, v3.1-nanoserver-ltsc2022, 3.1-nanoserver-ltsc2022, comte-nanoserver-ltsc2022
+Tags: v3.1.0-nanoserver-ltsc2022, 3.1.0-nanoserver-ltsc2022, v3.1-nanoserver-ltsc2022, 3.1-nanoserver-ltsc2022, comte-nanoserver-ltsc2022, nanoserver-ltsc2022
 Architectures: windows-amd64
 GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 30b5ca403f1a1caef4c6b91112616eec405c4d95
+GitCommit: 2f8afc4591f5faf2b4ec8279ed8128ffbb919e41
 Directory: v3.1/windows/nanoserver-ltsc2022
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
-Tags: v3.1.0-rc3-windowsservercore-1809, 3.1.0-rc3-windowsservercore-1809, v3.1-windowsservercore-1809, 3.1-windowsservercore-1809, comte-windowsservercore-1809
+Tags: v3.1.0-windowsservercore-1809, 3.1.0-windowsservercore-1809, v3.1-windowsservercore-1809, 3.1-windowsservercore-1809, comte-windowsservercore-1809, windowsservercore-1809
 Architectures: windows-amd64
 GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 30b5ca403f1a1caef4c6b91112616eec405c4d95
+GitCommit: 2f8afc4591f5faf2b4ec8279ed8128ffbb919e41
 Directory: v3.1/windows/1809
 Constraints: windowsservercore-1809
 
-Tags: v3.1.0-rc3-windowsservercore-ltsc2022, 3.1.0-rc3-windowsservercore-ltsc2022, v3.1-windowsservercore-ltsc2022, 3.1-windowsservercore-ltsc2022, comte-windowsservercore-ltsc2022
+Tags: v3.1.0-windowsservercore-ltsc2022, 3.1.0-windowsservercore-ltsc2022, v3.1-windowsservercore-ltsc2022, 3.1-windowsservercore-ltsc2022, comte-windowsservercore-ltsc2022, windowsservercore-ltsc2022
 Architectures: windows-amd64
 GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 30b5ca403f1a1caef4c6b91112616eec405c4d95
+GitCommit: 2f8afc4591f5faf2b4ec8279ed8128ffbb919e41
 Directory: v3.1/windows/servercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index c908392..226e0df 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,26 +6,14 @@ traefik:2.11.6
 traefik:2.11.6-nanoserver-ltsc2022
 traefik:2.11.6-windowsservercore-1809
 traefik:2.11.6-windowsservercore-ltsc2022
-traefik:3.0
-traefik:3.0-nanoserver-ltsc2022
-traefik:3.0-windowsservercore-1809
-traefik:3.0-windowsservercore-ltsc2022
-traefik:3.0.4
-traefik:3.0.4-nanoserver-ltsc2022
-traefik:3.0.4-windowsservercore-1809
-traefik:3.0.4-windowsservercore-ltsc2022
 traefik:3.1
 traefik:3.1-nanoserver-ltsc2022
 traefik:3.1-windowsservercore-1809
 traefik:3.1-windowsservercore-ltsc2022
-traefik:3.1.0-rc3
-traefik:3.1.0-rc3-nanoserver-ltsc2022
-traefik:3.1.0-rc3-windowsservercore-1809
-traefik:3.1.0-rc3-windowsservercore-ltsc2022
-traefik:beaufort
-traefik:beaufort-nanoserver-ltsc2022
-traefik:beaufort-windowsservercore-1809
-traefik:beaufort-windowsservercore-ltsc2022
+traefik:3.1.0
+traefik:3.1.0-nanoserver-ltsc2022
+traefik:3.1.0-windowsservercore-1809
+traefik:3.1.0-windowsservercore-ltsc2022
 traefik:comte
 traefik:comte-nanoserver-ltsc2022
 traefik:comte-windowsservercore-1809
@@ -44,21 +32,13 @@ traefik:v2.11.6
 traefik:v2.11.6-nanoserver-ltsc2022
 traefik:v2.11.6-windowsservercore-1809
 traefik:v2.11.6-windowsservercore-ltsc2022
-traefik:v3.0
-traefik:v3.0-nanoserver-ltsc2022
-traefik:v3.0-windowsservercore-1809
-traefik:v3.0-windowsservercore-ltsc2022
-traefik:v3.0.4
-traefik:v3.0.4-nanoserver-ltsc2022
-traefik:v3.0.4-windowsservercore-1809
-traefik:v3.0.4-windowsservercore-ltsc2022
 traefik:v3.1
 traefik:v3.1-nanoserver-ltsc2022
 traefik:v3.1-windowsservercore-1809
 traefik:v3.1-windowsservercore-ltsc2022
-traefik:v3.1.0-rc3
-traefik:v3.1.0-rc3-nanoserver-ltsc2022
-traefik:v3.1.0-rc3-windowsservercore-1809
-traefik:v3.1.0-rc3-windowsservercore-ltsc2022
+traefik:v3.1.0
+traefik:v3.1.0-nanoserver-ltsc2022
+traefik:v3.1.0-windowsservercore-1809
+traefik:v3.1.0-windowsservercore-ltsc2022
 traefik:windowsservercore-1809
 traefik:windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 8e8ccbb..c7e90e8 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,12 +1,8 @@
-traefik:comte
-traefik:comte-windowsservercore-1809
-traefik:comte-windowsservercore-ltsc2022
 traefik:latest
 traefik:mimolette
 traefik:mimolette-windowsservercore-1809
 traefik:mimolette-windowsservercore-ltsc2022
 traefik:windowsservercore-1809
 traefik:windowsservercore-ltsc2022
-traefik:comte-nanoserver-ltsc2022
 traefik:mimolette-nanoserver-ltsc2022
 traefik:nanoserver-ltsc2022
diff --git a/traefik_comte-nanoserver-ltsc2022/Dockerfile b/traefik_comte-nanoserver-ltsc2022/Dockerfile
deleted file mode 100644
index 490d643..0000000
diff --git a/traefik_comte-windowsservercore-1809/Dockerfile b/traefik_comte-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 96ffa44..0000000
diff --git a/traefik_comte-windowsservercore-ltsc2022/Dockerfile b/traefik_comte-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index 81c2824..0000000
diff --git a/traefik_comte/Dockerfile b/traefik_comte/Dockerfile
deleted file mode 100644
index 97838bc..0000000
diff --git a/traefik_comte/entrypoint.sh b/traefik_comte/entrypoint.sh
deleted file mode 100755
index 72b0b69..0000000
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index 350ce4e..c0daa24 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_latest/Dockerfile
@@ -11,7 +11,7 @@ RUN set -ex; \
 		ppc64le) arch='ppc64le' ;; \
 		*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
 	esac; \
-	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v3.0.4/traefik_v3.0.4_linux_$arch.tar.gz"; \
+	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v3.1.0/traefik_v3.1.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
@@ -26,5 +26,5 @@ LABEL org.opencontainers.image.vendor="Traefik Labs" \
     org.opencontainers.image.source="https://github.com/traefik/traefik" \
     org.opencontainers.image.title="Traefik" \
     org.opencontainers.image.description="A modern reverse-proxy" \
-    org.opencontainers.image.version="v3.0.4" \
+    org.opencontainers.image.version="v3.1.0" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_nanoserver-ltsc2022/Dockerfile b/traefik_nanoserver-ltsc2022/Dockerfile
index 76b451d..a599ef2 100644
--- a/traefik_nanoserver-ltsc2022/Dockerfile
+++ b/traefik_nanoserver-ltsc2022/Dockerfile
@@ -1,6 +1,6 @@
 FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
 
-COPY --from=traefik:v3.0.4-windowsservercore-ltsc2022 /traefik.exe /
+COPY --from=traefik:v3.1.0-windowsservercore-ltsc2022 /traefik.exe /
 
 EXPOSE 80
 ENTRYPOINT [ "/traefik" ]
@@ -11,5 +11,5 @@ LABEL org.opencontainers.image.vendor="Traefik Labs" \
     org.opencontainers.image.source="https://github.com/traefik/traefik" \
     org.opencontainers.image.title="Traefik" \
     org.opencontainers.image.description="A modern reverse-proxy" \
-    org.opencontainers.image.version="v3.0.4" \
+    org.opencontainers.image.version="v3.1.0" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_windowsservercore-1809/Dockerfile b/traefik_windowsservercore-1809/Dockerfile
index 305e4e2..0ef8b59 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/v3.0.4/traefik_v3.0.4_windows_amd64.zip" \
+        -Uri "https://github.com/traefik/traefik/releases/download/v3.1.0/traefik_v3.1.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="Traefik Labs" \
     org.opencontainers.image.source="https://github.com/traefik/traefik" \
     org.opencontainers.image.title="Traefik" \
     org.opencontainers.image.description="A modern reverse-proxy" \
-    org.opencontainers.image.version="v3.0.4" \
+    org.opencontainers.image.version="v3.1.0" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_windowsservercore-ltsc2022/Dockerfile b/traefik_windowsservercore-ltsc2022/Dockerfile
index 79f4865..ad236d7 100644
--- a/traefik_windowsservercore-ltsc2022/Dockerfile
+++ b/traefik_windowsservercore-ltsc2022/Dockerfile
@@ -2,7 +2,7 @@ FROM  mcr.microsoft.com/windows/servercore:ltsc2022
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 RUN Invoke-WebRequest \
-        -Uri "https://github.com/traefik/traefik/releases/download/v3.0.4/traefik_v3.0.4_windows_amd64.zip" \
+        -Uri "https://github.com/traefik/traefik/releases/download/v3.1.0/traefik_v3.1.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="Traefik Labs" \
     org.opencontainers.image.source="https://github.com/traefik/traefik" \
     org.opencontainers.image.title="Traefik" \
     org.opencontainers.image.description="A modern reverse-proxy" \
-    org.opencontainers.image.version="v3.0.4" \
+    org.opencontainers.image.version="v3.1.0" \
     org.opencontainers.image.documentation="https://docs.traefik.io"

Relevant Maintainers:

@yosifkit yosifkit merged commit 3baaa5d into docker-library:master Jul 15, 2024
11 checks passed
@rtribotte rtribotte deleted the traefik-new-version-2f8afc4591f5faf2b4ec8279ed8128ffbb919e41 branch December 16, 2024 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants