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-rc1 #9297

Conversation

ldez
Copy link
Contributor

@ldez ldez commented Dec 16, 2020

Hello,

This PR updates Traefik to v2.4.0-rc1.

/cc @rtribotte @SantoDE @jbdoumenjou

Cheers

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

Copy link
Contributor

@jbdoumenjou jbdoumenjou 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 dac29ed:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index edf8d7f..47e9423 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -26,6 +26,19 @@ GitCommit: d1233fc2eb8fa09950515598dfa34c70c69b260b
 Directory: windows/1809
 Constraints: windowsservercore-1809
 
+Tags: v2.4.0-rc1, 2.4.0-rc1, v2.4, 2.4, livarot
+Architectures: amd64, arm32v6, arm64v8
+GitRepo: https://github.com/traefik/traefik-library-image.git
+GitCommit: e3a11c7578f6cbc690f64a964f794f604840a4bf
+Directory: alpine
+
+Tags: v2.4.0-rc1-windowsservercore-1809, 2.4.0-rc1-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: e3a11c7578f6cbc690f64a964f794f604840a4bf
+Directory: windows/1809
+Constraints: windowsservercore-1809
+
 Tags: v1.7.26, 1.7.26, v1.7, 1.7, maroilles
 Architectures: amd64, arm32v6, arm64v8
 GitRepo: https://github.com/containous/traefik-library-image.git
diff --git a/_bashbrew-list b/_bashbrew-list
index 503d5f6..24d7a71 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,7 +8,13 @@ traefik:2.3
 traefik:2.3-windowsservercore-1809
 traefik:2.3.5
 traefik:2.3.5-windowsservercore-1809
+traefik:2.4
+traefik:2.4-windowsservercore-1809
+traefik:2.4.0-rc1
+traefik:2.4.0-rc1-windowsservercore-1809
 traefik:latest
+traefik:livarot
+traefik:livarot-windowsservercore-1809
 traefik:maroilles
 traefik:maroilles-alpine
 traefik:maroilles-windowsservercore-1809
@@ -24,4 +30,8 @@ traefik:v2.3
 traefik:v2.3-windowsservercore-1809
 traefik:v2.3.5
 traefik:v2.3.5-windowsservercore-1809
+traefik:v2.4
+traefik:v2.4-windowsservercore-1809
+traefik:v2.4.0-rc1
+traefik:v2.4.0-rc1-windowsservercore-1809
 traefik:windowsservercore-1809
diff --git a/traefik_windowsservercore-1809/Dockerfile b/traefik_livarot-windowsservercore-1809/Dockerfile
similarity index 87%
copy from traefik_windowsservercore-1809/Dockerfile
copy to traefik_livarot-windowsservercore-1809/Dockerfile
index 5153c36..fc5c07a 100644
--- a/traefik_windowsservercore-1809/Dockerfile
+++ b/traefik_livarot-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.5/traefik_v2.3.5_windows_amd64.zip" \
+        -Uri "https://github.com/traefik/traefik/releases/download/v2.4.0-rc1/traefik_v2.4.0-rc1_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.5" \
+    org.opencontainers.image.version="v2.4.0-rc1" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_latest/Dockerfile b/traefik_livarot/Dockerfile
similarity index 86%
copy from traefik_latest/Dockerfile
copy to traefik_livarot/Dockerfile
index 51d049c..32ff3a9 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_livarot/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.5/traefik_v2.3.5_linux_$arch.tar.gz"; \
+	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v2.4.0-rc1/traefik_v2.4.0-rc1_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.5" \
+	org.opencontainers.image.version="v2.4.0-rc1" \
 	org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_latest/entrypoint.sh b/traefik_livarot/entrypoint.sh
similarity index 100%
copy from traefik_latest/entrypoint.sh
copy to traefik_livarot/entrypoint.sh

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

@dtomcej dtomcej left a comment

Choose a reason for hiding this comment

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

LGTM
:shipit:

@yosifkit yosifkit merged commit b44031b into docker-library:master Dec 16, 2020
@ldez ldez deleted the traefik-new-version-e3a11c7578f6cbc690f64a964f794f604840a4bf branch December 17, 2020 00:31
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.

6 participants