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-rc2 #17077

Merged
merged 1 commit into from
Jun 28, 2024
Merged

Conversation

kevinpollet
Copy link
Contributor

@kevinpollet kevinpollet commented Jun 28, 2024

Hello,

This PR updates Traefik to v3.1.0-rc2 and updates the maintainer list according to traefik/traefik#10827.

/cc @nmengin @emilevauge @mmatur @rtribotte @juliens

Cheers

@kevinpollet kevinpollet requested a review from a team as a code owner June 28, 2024 12:32
Copy link

Diff for 89ab6b2:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 55595e2..94f0fe4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,4 +1,4 @@
-Maintainers: Ludovic Fernandez <[email protected]> (@ldez), Julien Salleyron <[email protected]> (@juliens), Romain Tribotté <[email protected]> (@rtribotte), Michael Matur <[email protected]> (@mmatur), Kevin Pollet <[email protected]> (@kevinpollet), Tom Moulard <[email protected]> (@tommoulard)
+Maintainers: Julien Salleyron <[email protected]> (@juliens), Romain Tribotté <[email protected]> (@rtribotte), Michael Matur <[email protected]> (@mmatur), Kevin Pollet <[email protected]> (@kevinpollet), Tom Moulard <[email protected]> (@tommoulard)
 
 Tags: v2.11.5, 2.11.5, v2.11, 2.11, mimolette
 Architectures: amd64, arm32v6, arm64v8, ppc64le, riscv64, s390x
@@ -53,3 +53,30 @@ GitRepo: https://github.com/traefik/traefik-library-image.git
 GitCommit: e4bd02cde037ae1002cbb2de6358a2e067158d84
 Directory: v3.0/windows/servercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
+
+Tags: v3.1.0-rc2, 3.1.0-rc2, v3.1, 3.1, comte
+Architectures: amd64, arm32v6, arm64v8, ppc64le, riscv64, s390x
+GitRepo: https://github.com/traefik/traefik-library-image.git
+GitCommit: e8e43baa0a336e4ab03ffcaa02377b446c146274
+Directory: v3.1/alpine
+
+Tags: v3.1.0-rc2-nanoserver-ltsc2022, 3.1.0-rc2-nanoserver-ltsc2022, v3.1-nanoserver-ltsc2022, 3.1-nanoserver-ltsc2022, comte-nanoserver-ltsc2022
+Architectures: windows-amd64
+GitRepo: https://github.com/traefik/traefik-library-image.git
+GitCommit: e8e43baa0a336e4ab03ffcaa02377b446c146274
+Directory: v3.1/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: v3.1.0-rc2-windowsservercore-1809, 3.1.0-rc2-windowsservercore-1809, v3.1-windowsservercore-1809, 3.1-windowsservercore-1809, comte-windowsservercore-1809
+Architectures: windows-amd64
+GitRepo: https://github.com/traefik/traefik-library-image.git
+GitCommit: e8e43baa0a336e4ab03ffcaa02377b446c146274
+Directory: v3.1/windows/1809
+Constraints: windowsservercore-1809
+
+Tags: v3.1.0-rc2-windowsservercore-ltsc2022, 3.1.0-rc2-windowsservercore-ltsc2022, v3.1-windowsservercore-ltsc2022, 3.1-windowsservercore-ltsc2022, comte-windowsservercore-ltsc2022
+Architectures: windows-amd64
+GitRepo: https://github.com/traefik/traefik-library-image.git
+GitCommit: e8e43baa0a336e4ab03ffcaa02377b446c146274
+Directory: v3.1/windows/servercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 335600b..913242f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,10 +14,22 @@ traefik:3.0.3
 traefik:3.0.3-nanoserver-ltsc2022
 traefik:3.0.3-windowsservercore-1809
 traefik:3.0.3-windowsservercore-ltsc2022
+traefik:3.1
+traefik:3.1-nanoserver-ltsc2022
+traefik:3.1-windowsservercore-1809
+traefik:3.1-windowsservercore-ltsc2022
+traefik:3.1.0-rc2
+traefik:3.1.0-rc2-nanoserver-ltsc2022
+traefik:3.1.0-rc2-windowsservercore-1809
+traefik:3.1.0-rc2-windowsservercore-ltsc2022
 traefik:beaufort
 traefik:beaufort-nanoserver-ltsc2022
 traefik:beaufort-windowsservercore-1809
 traefik:beaufort-windowsservercore-ltsc2022
+traefik:comte
+traefik:comte-nanoserver-ltsc2022
+traefik:comte-windowsservercore-1809
+traefik:comte-windowsservercore-ltsc2022
 traefik:latest
 traefik:mimolette
 traefik:mimolette-nanoserver-ltsc2022
@@ -40,5 +52,13 @@ traefik:v3.0.3
 traefik:v3.0.3-nanoserver-ltsc2022
 traefik:v3.0.3-windowsservercore-1809
 traefik:v3.0.3-windowsservercore-ltsc2022
+traefik:v3.1
+traefik:v3.1-nanoserver-ltsc2022
+traefik:v3.1-windowsservercore-1809
+traefik:v3.1-windowsservercore-ltsc2022
+traefik:v3.1.0-rc2
+traefik:v3.1.0-rc2-nanoserver-ltsc2022
+traefik:v3.1.0-rc2-windowsservercore-1809
+traefik:v3.1.0-rc2-windowsservercore-ltsc2022
 traefik:windowsservercore-1809
 traefik:windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c7e90e8..8e8ccbb 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,8 +1,12 @@
+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_nanoserver-ltsc2022/Dockerfile b/traefik_comte-nanoserver-ltsc2022/Dockerfile
similarity index 79%
copy from traefik_nanoserver-ltsc2022/Dockerfile
copy to traefik_comte-nanoserver-ltsc2022/Dockerfile
index f35f261..2d34e3f 100644
--- a/traefik_nanoserver-ltsc2022/Dockerfile
+++ b/traefik_comte-nanoserver-ltsc2022/Dockerfile
@@ -1,6 +1,6 @@
 FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
 
-COPY --from=traefik:v3.0.3-windowsservercore-ltsc2022 /traefik.exe /
+COPY --from=traefik:v3.1.0-rc2-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.3" \
+    org.opencontainers.image.version="v3.1.0-rc2" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_windowsservercore-1809/Dockerfile b/traefik_comte-windowsservercore-1809/Dockerfile
similarity index 88%
copy from traefik_windowsservercore-1809/Dockerfile
copy to traefik_comte-windowsservercore-1809/Dockerfile
index b9766cf..7d23f1d 100644
--- a/traefik_windowsservercore-1809/Dockerfile
+++ b/traefik_comte-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.3/traefik_v3.0.3_windows_amd64.zip" \
+        -Uri "https://github.com/traefik/traefik/releases/download/v3.1.0-rc2/traefik_v3.1.0-rc2_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.3" \
+    org.opencontainers.image.version="v3.1.0-rc2" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_mimolette-windowsservercore-ltsc2022/Dockerfile b/traefik_comte-windowsservercore-ltsc2022/Dockerfile
similarity index 88%
copy from traefik_mimolette-windowsservercore-ltsc2022/Dockerfile
copy to traefik_comte-windowsservercore-ltsc2022/Dockerfile
index a28d455..cdf931b 100644
--- a/traefik_mimolette-windowsservercore-ltsc2022/Dockerfile
+++ b/traefik_comte-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/v2.11.5/traefik_v2.11.5_windows_amd64.zip" \
+        -Uri "https://github.com/traefik/traefik/releases/download/v3.1.0-rc2/traefik_v3.1.0-rc2_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="v2.11.5" \
+    org.opencontainers.image.version="v3.1.0-rc2" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_latest/Dockerfile b/traefik_comte/Dockerfile
similarity index 88%
copy from traefik_latest/Dockerfile
copy to traefik_comte/Dockerfile
index 8b74900..2bc74e5 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_comte/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.3/traefik_v3.0.3_linux_$arch.tar.gz"; \
+	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v3.1.0-rc2/traefik_v3.1.0-rc2_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.3" \
+    org.opencontainers.image.version="v3.1.0-rc2" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_latest/entrypoint.sh b/traefik_comte/entrypoint.sh
similarity index 100%
copy from traefik_latest/entrypoint.sh
copy to traefik_comte/entrypoint.sh

Relevant Maintainers:

@tianon tianon merged commit b48ae38 into docker-library:master Jun 28, 2024
14 checks passed
@tianon
Copy link
Member

tianon commented Jun 28, 2024

❤️

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