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

Update Traefik to bump Alpine images to v3.20 #16871

Closed
wants to merge 2 commits into from

Conversation

rtribotte
Copy link
Contributor

Hello,

This PR updates Traefik manifest to bump Alpine images to v3.20

/cc @ldez @mmatur @nmengin @kevinpollet

Cheers

@rtribotte rtribotte requested a review from a team as a code owner May 30, 2024 08:41
Copy link

Diff for cb9cdda:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 87d6cd4..ec47e43 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,11 +1,5 @@
 Maintainers: Ludovic Fernandez <ludovic@traefik.io> (@ldez), Julien Salleyron <julien@traefik.io> (@juliens), Romain Tribotté <romain.tribotte@traefik.io> (@rtribotte), Michael Matur <michael@traefik.io> (@mmatur), Kevin Pollet <kevin.pollet@traefik.io> (@kevinpollet), Tom Moulard <tom.moulard@traefik.io> (@tommoulard)
 
-Tags: v2.11.3, 2.11.3, v2.11, 2.11, mimolette
-Architectures: amd64, arm32v6, arm64v8, ppc64le, s390x
-GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 98edda3a6008ef1b658911e757b68bd06ea2ed8d
-Directory: alpine
-
 Tags: v2.11.3-nanoserver-ltsc2022, 2.11.3-nanoserver-ltsc2022, v2.11-nanoserver-ltsc2022, 2.11-nanoserver-ltsc2022, mimolette-nanoserver-ltsc2022
 Architectures: windows-amd64
 GitRepo: https://github.com/traefik/traefik-library-image.git
@@ -27,10 +21,10 @@ GitCommit: 98edda3a6008ef1b658911e757b68bd06ea2ed8d
 Directory: windows/servercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: v3.0.1, 3.0.1, v3.0, 3.0, beaufort, latest
+Tags: v3.0.1, 3.0.1, v3.0, 3.0, beaufort, latest, v2.11.3, 2.11.3, v2.11, 2.11, mimolette
 Architectures: amd64, arm32v6, arm64v8, ppc64le, s390x
 GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 2caca4e184cbc99169ad4043d35e3482548c3410
+GitCommit: e971e752e97b340b47dde038edbb9052d3064781
 Directory: alpine
 
 Tags: v3.0.1-nanoserver-ltsc2022, 3.0.1-nanoserver-ltsc2022, v3.0-nanoserver-ltsc2022, 3.0-nanoserver-ltsc2022, beaufort-nanoserver-ltsc2022, nanoserver-ltsc2022
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
deleted file mode 100644
index ee42c6e..0000000
diff --git a/traefik_latest/entrypoint.sh b/traefik_latest/entrypoint.sh
deleted file mode 100755
index 72b0b69..0000000
diff --git a/traefik_mimolette/Dockerfile b/traefik_mimolette/Dockerfile
index 48228cc..5fe265a 100644
--- a/traefik_mimolette/Dockerfile
+++ b/traefik_mimolette/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 RUN apk --no-cache add ca-certificates tzdata
 RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
@@ -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/v2.11.3/traefik_v2.11.3_linux_$arch.tar.gz"; \
+	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v3.0.1/traefik_v3.0.1_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="v2.11.3" \
+    org.opencontainers.image.version="v3.0.1" \
     org.opencontainers.image.documentation="https://docs.traefik.io"

Relevant Maintainers:

@LaurentGoderre
Copy link
Member

This either has to wait for traefik/traefik-library-image#62 to land or only apply to the v3.0 release for now.

@@ -51,5 +51,5 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
Tags: v2.11.3, 2.11.3, v2.11, 2.11, mimolette
Architectures: amd64, arm32v6, arm64v8, ppc64le, s390x
GitRepo: https://github.com/traefik/traefik-library-image.git
GitCommit: 98edda3a6008ef1b658911e757b68bd06ea2ed8d
GitCommit: e971e752e97b340b47dde038edbb9052d3064781
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If not waiting for traefik/traefik-library-image#62, this needs to be reverted

Copy link
Member

@LaurentGoderre LaurentGoderre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this current state, v2.11.3 tags would be pushed with v3.0 version

@rtribotte
Copy link
Contributor Author

Thanks @LaurentGoderre, we are closing this PR and waiting for traefik/traefik-library-image#62 to be merged.

@rtribotte rtribotte closed this May 30, 2024
@rtribotte rtribotte deleted the patch-1 branch December 16, 2024 15:00
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