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 v2.4.0 #9450

Conversation

ldez
Copy link
Contributor

@ldez ldez commented Jan 19, 2021

Hello,

This PR updates Traefik to v2.4.0.

/cc @kevinpollet @rtribotte @SantoDE @jbdoumenjou

Cheers

Copy link
Contributor

@kevinpollet kevinpollet left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions
Copy link

Diff for b183d42:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9b3af6d..3adcfc4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,4 +1,4 @@
-Maintainers: Emile Vauge <emile@vauge.com> (@emilevauge), Vincent Demeester <vincent@sbr.pm> (@vdemeester), 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)
+Maintainers: Emile Vauge <emile@vauge.com> (@emilevauge), 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)
 
 Tags: v1.7.28-alpine, 1.7.28-alpine, v1.7-alpine, 1.7-alpine, maroilles-alpine
 Architectures: amd64, arm32v6, arm64v8
@@ -13,29 +13,16 @@ GitCommit: 304f7cf2cf36f59e0bc93597579c61837ce2ea6f
 Directory: windows/1809
 Constraints: windowsservercore-1809
 
-Tags: v2.3.7, 2.3.7, v2.3, 2.3, picodon, latest
+Tags: v2.4.0, 2.4.0, v2.4, 2.4, livarot, latest
 Architectures: amd64, arm32v6, arm64v8
 GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 5f8653509193f68c10ac12d5ebfe8657d7cd2bf7
+GitCommit: 5e77e1dc9f9f30035cabec0f898581caabeccc10
 Directory: alpine
 
-Tags: v2.3.7-windowsservercore-1809, 2.3.7-windowsservercore-1809, v2.3-windowsservercore-1809, 2.3-windowsservercore-1809, picodon-windowsservercore-1809, windowsservercore-1809
+Tags: v2.4.0-windowsservercore-1809, 2.4.0-windowsservercore-1809, v2.4-windowsservercore-1809, 2.4-windowsservercore-1809, livarot-windowsservercore-1809, windowsservercore-1809
 Architectures: windows-amd64
 GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 5f8653509193f68c10ac12d5ebfe8657d7cd2bf7
-Directory: windows/1809
-Constraints: windowsservercore-1809
-
-Tags: v2.4.0-rc2, 2.4.0-rc2, v2.4, 2.4, livarot
-Architectures: amd64, arm32v6, arm64v8
-GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 89302d9c2acc57903e9d48790597860a08858d68
-Directory: alpine
-
-Tags: v2.4.0-rc2-windowsservercore-1809, 2.4.0-rc2-windowsservercore-1809, v2.4-windowsservercore-1809, 2.4-windowsservercore-1809, livarot-windowsservercore-1809
-Architectures: windows-amd64
-GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: 89302d9c2acc57903e9d48790597860a08858d68
+GitCommit: 5e77e1dc9f9f30035cabec0f898581caabeccc10
 Directory: windows/1809
 Constraints: windowsservercore-1809
 
diff --git a/_bashbrew-list b/_bashbrew-list
index 668945d..52086a0 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,34 +4,24 @@ traefik:1.7-windowsservercore-1809
 traefik:1.7.28
 traefik:1.7.28-alpine
 traefik:1.7.28-windowsservercore-1809
-traefik:2.3
-traefik:2.3-windowsservercore-1809
-traefik:2.3.7
-traefik:2.3.7-windowsservercore-1809
 traefik:2.4
 traefik:2.4-windowsservercore-1809
-traefik:2.4.0-rc2
-traefik:2.4.0-rc2-windowsservercore-1809
+traefik:2.4.0
+traefik:2.4.0-windowsservercore-1809
 traefik:latest
 traefik:livarot
 traefik:livarot-windowsservercore-1809
 traefik:maroilles
 traefik:maroilles-alpine
 traefik:maroilles-windowsservercore-1809
-traefik:picodon
-traefik:picodon-windowsservercore-1809
 traefik:v1.7
 traefik:v1.7-alpine
 traefik:v1.7-windowsservercore-1809
 traefik:v1.7.28
 traefik:v1.7.28-alpine
 traefik:v1.7.28-windowsservercore-1809
-traefik:v2.3
-traefik:v2.3-windowsservercore-1809
-traefik:v2.3.7
-traefik:v2.3.7-windowsservercore-1809
 traefik:v2.4
 traefik:v2.4-windowsservercore-1809
-traefik:v2.4.0-rc2
-traefik:v2.4.0-rc2-windowsservercore-1809
+traefik:v2.4.0
+traefik:v2.4.0-windowsservercore-1809
 traefik:windowsservercore-1809
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index ec975b2..c80d65e 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.3.7/traefik_v2.3.7_linux_$arch.tar.gz"; \
+	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v2.4.0/traefik_v2.4.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.3.7" \
+	org.opencontainers.image.version="v2.4.0" \
 	org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_livarot-windowsservercore-1809/Dockerfile b/traefik_livarot-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 9e50ce7..0000000
diff --git a/traefik_livarot/Dockerfile b/traefik_livarot/Dockerfile
deleted file mode 100644
index c65ccb8..0000000
diff --git a/traefik_livarot/entrypoint.sh b/traefik_livarot/entrypoint.sh
deleted file mode 100755
index 72b0b69..0000000
diff --git a/traefik_windowsservercore-1809/Dockerfile b/traefik_windowsservercore-1809/Dockerfile
index 7f2c541..722c8bd 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.3.7/traefik_v2.3.7_windows_amd64.zip" \
+        -Uri "https://github.com/traefik/traefik/releases/download/v2.4.0/traefik_v2.4.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.3.7" \
+    org.opencontainers.image.version="v2.4.0" \
     org.opencontainers.image.documentation="https://docs.traefik.io"

Copy link

@SantoDE SantoDE left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@rtribotte rtribotte left a comment

Choose a reason for hiding this comment

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

LGTM

@yosifkit yosifkit merged commit b40bca0 into docker-library:master Jan 19, 2021
@yosifkit
Copy link
Member

Welcome new maintainer @kevinpollet! 😸

And thanks to @vdemeester for your previous work 👍 ❤️

@ldez ldez deleted the traefik-new-version-5e77e1dc9f9f30035cabec0f898581caabeccc10 branch January 20, 2021 03:11
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.

5 participants