Merge branch 'traefik:master' into chore/update-readme

traefik · Oct 18, 2024 · 01332c8 · 01332c8
2 parents deae1d6 + 9e56776
commit 01332c8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/v3.2/alpine/Dockerfile b/v3.2/alpine/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.2.0-rc1/traefik_v3.2.0-rc1_linux_$arch.tar.gz"; \
+	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v3.2.0-rc2/traefik_v3.2.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.2.0-rc1" \
+    org.opencontainers.image.version="v3.2.0-rc2" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/v3.2/scratch/Dockerfile b/v3.2/scratch/Dockerfile
@@ -1,7 +1,7 @@
 FROM scratch
-COPY --from=traefik:v3.2.0-rc1-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=traefik:v3.2.0-rc1-alpine /usr/share/zoneinfo /usr/share/
-COPY --from=traefik:v3.2.0-rc1-alpine /usr/local/bin/traefik /
+COPY --from=traefik:v3.2.0-rc2-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=traefik:v3.2.0-rc2-alpine /usr/share/zoneinfo /usr/share/
+COPY --from=traefik:v3.2.0-rc2-alpine /usr/local/bin/traefik /
 
 EXPOSE 80
 VOLUME ["/tmp"]
@@ -13,5 +13,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.2.0-rc1" \
+    org.opencontainers.image.version="v3.2.0-rc2" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/v3.2/windows/1809/Dockerfile b/v3.2/windows/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.2.0-rc1/traefik_v3.2.0-rc1_windows_amd64.zip" \
+        -Uri "https://github.com/traefik/traefik/releases/download/v3.2.0-rc2/traefik_v3.2.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.2.0-rc1" \
+    org.opencontainers.image.version="v3.2.0-rc2" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/v3.2/windows/nanoserver-ltsc2022/Dockerfile b/v3.2/windows/nanoserver-ltsc2022/Dockerfile
@@ -1,6 +1,6 @@
 FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
 
-COPY --from=traefik:v3.2.0-rc1-windowsservercore-ltsc2022 /traefik.exe /
+COPY --from=traefik:v3.2.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.2.0-rc1" \
+    org.opencontainers.image.version="v3.2.0-rc2" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/v3.2/windows/servercore-ltsc2022/Dockerfile b/v3.2/windows/servercore-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.2.0-rc1/traefik_v3.2.0-rc1_windows_amd64.zip" \
+        -Uri "https://github.com/traefik/traefik/releases/download/v3.2.0-rc2/traefik_v3.2.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.2.0-rc1" \
+    org.opencontainers.image.version="v3.2.0-rc2" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/version b/version
@@ -1 +1 @@
-v3.1.6
+v3.2.0-rc2