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.2.0-rc4 and v2.1.8 #7646

Conversation

ldez
Copy link
Contributor

@ldez ldez commented Mar 19, 2020

Hello,

This PR updates Traefik to:

/cc @mmatur @emilevauge @SantoDE @dtomcej

Cheers

@ldez ldez changed the title Bump Traefik to v2.2.0-rc4 Bump Traefik to v2.2.0-rc4 and v2.1.8 Mar 19, 2020
Copy link
Contributor

@mmatur mmatur 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
Copy link
Member

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index d6305ce..d20bcab 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,12 +6,12 @@ traefik:1.7.22-alpine
 traefik:1.7.22-windowsservercore-1809
 traefik:2.1
 traefik:2.1-windowsservercore-1809
-traefik:2.1.7
-traefik:2.1.7-windowsservercore-1809
+traefik:2.1.8
+traefik:2.1.8-windowsservercore-1809
 traefik:2.2
 traefik:2.2-windowsservercore-1809
-traefik:2.2.0-rc3
-traefik:2.2.0-rc3-windowsservercore-1809
+traefik:2.2.0-rc4
+traefik:2.2.0-rc4-windowsservercore-1809
 traefik:cantal
 traefik:cantal-windowsservercore-1809
 traefik:chevrotin
@@ -28,10 +28,10 @@ traefik:v1.7.22-alpine
 traefik:v1.7.22-windowsservercore-1809
 traefik:v2.1
 traefik:v2.1-windowsservercore-1809
-traefik:v2.1.7
-traefik:v2.1.7-windowsservercore-1809
+traefik:v2.1.8
+traefik:v2.1.8-windowsservercore-1809
 traefik:v2.2
 traefik:v2.2-windowsservercore-1809
-traefik:v2.2.0-rc3
-traefik:v2.2.0-rc3-windowsservercore-1809
+traefik:v2.2.0-rc4
+traefik:v2.2.0-rc4-windowsservercore-1809
 traefik:windowsservercore-1809
diff --git a/traefik_chevrotin-windowsservercore-1809/Dockerfile b/traefik_chevrotin-windowsservercore-1809/Dockerfile
index 99e2106..f1f50fa 100644
--- a/traefik_chevrotin-windowsservercore-1809/Dockerfile
+++ b/traefik_chevrotin-windowsservercore-1809/Dockerfile
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/windows/servercore:1809
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 RUN Invoke-WebRequest \
-        -Uri "https://github.com/containous/traefik/releases/download/v2.2.0-rc3/traefik_v2.2.0-rc3_windows_amd64.zip" \
+        -Uri "https://github.com/containous/traefik/releases/download/v2.2.0-rc4/traefik_v2.2.0-rc4_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="Containous" \
     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.2.0-rc3" \
+    org.opencontainers.image.version="v2.2.0-rc4" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_chevrotin/Dockerfile b/traefik_chevrotin/Dockerfile
index 845ea89..7e087e7 100644
--- a/traefik_chevrotin/Dockerfile
+++ b/traefik_chevrotin/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/containous/traefik/releases/download/v2.2.0-rc3/traefik_v2.2.0-rc3_linux_$arch.tar.gz"; \
+	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.2.0-rc4/traefik_v2.2.0-rc4_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="Containous" \
 	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.2.0-rc3" \
+	org.opencontainers.image.version="v2.2.0-rc4" \
 	org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index e88ac12..b8f9e3d 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/containous/traefik/releases/download/v2.1.7/traefik_v2.1.7_linux_$arch.tar.gz"; \
+	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.1.8/traefik_v2.1.8_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="Containous" \
 	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.1.7" \
+	org.opencontainers.image.version="v2.1.8" \
 	org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_windowsservercore-1809/Dockerfile b/traefik_windowsservercore-1809/Dockerfile
index 3e299c2..3905c3e 100644
--- a/traefik_windowsservercore-1809/Dockerfile
+++ b/traefik_windowsservercore-1809/Dockerfile
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/windows/servercore:1809
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 RUN Invoke-WebRequest \
-        -Uri "https://github.com/containous/traefik/releases/download/v2.1.7/traefik_v2.1.7_windows_amd64.zip" \
+        -Uri "https://github.com/containous/traefik/releases/download/v2.1.8/traefik_v2.1.8_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="Containous" \
     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.1.7" \
+    org.opencontainers.image.version="v2.1.8" \
     org.opencontainers.image.documentation="https://docs.traefik.io"

@yosifkit
Copy link
Member

Build test of #7646; b126a7e; amd64 (traefik):

$ bashbrew build traefik:v2.2.0-rc4-windowsservercore-1809
skipping "traefik:v2.2.0-rc4-windowsservercore-1809" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh traefik:v2.2.0-rc4-windowsservercore-1809
testing traefik:v2.2.0-rc4-windowsservercore-1809
	image has no tests...skipping


$ bashbrew build traefik:v2.2.0-rc4
Building bashbrew/cache:2c305b8b6a099bf3e394b7f58d84af57893ed87f7a8624a884e7502088c59731 (traefik:v2.2.0-rc4)
Tagging traefik:v2.2.0-rc4
Tagging traefik:2.2.0-rc4
Tagging traefik:v2.2
Tagging traefik:2.2
Tagging traefik:chevrotin

$ test/run.sh traefik:v2.2.0-rc4
testing traefik:v2.2.0-rc4
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...= 'echo' is not a Traefik command: assuming shell execution.
passed


$ bashbrew build traefik:v2.1.8-windowsservercore-1809
skipping "traefik:v2.1.8-windowsservercore-1809" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh traefik:v2.1.8-windowsservercore-1809
testing traefik:v2.1.8-windowsservercore-1809
	image has no tests...skipping


$ bashbrew build traefik:v2.1.8
Building bashbrew/cache:bb7f523dd97410e14ba73a04bcdc97d417bccf11ded5b2f0d9122bf1ba500e62 (traefik:v2.1.8)
Tagging traefik:v2.1.8
Tagging traefik:2.1.8
Tagging traefik:v2.1
Tagging traefik:2.1
Tagging traefik:cantal
Tagging traefik:latest

$ test/run.sh traefik:v2.1.8
testing traefik:v2.1.8
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...= 'echo' is not a Traefik command: assuming shell execution.
passed


$ bashbrew build traefik:v1.7.22-windowsservercore-1809
skipping "traefik:v1.7.22-windowsservercore-1809" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh traefik:v1.7.22-windowsservercore-1809
testing traefik:v1.7.22-windowsservercore-1809
	image has no tests...skipping


$ bashbrew build traefik:v1.7.22-alpine
Using bashbrew/cache:b484a91efcd25093f330a7940fb064616ade678cef004172bf804144ed9cf591 (traefik:v1.7.22-alpine)
Tagging traefik:v1.7.22-alpine
Tagging traefik:1.7.22-alpine
Tagging traefik:v1.7-alpine
Tagging traefik:1.7-alpine
Tagging traefik:maroilles-alpine

$ test/run.sh traefik:v1.7.22-alpine
testing traefik:v1.7.22-alpine
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...= 'echo' is not a Traefik command: assuming shell execution.
passed


$ bashbrew build traefik:v1.7.22
Using bashbrew/cache:71d972c94d36d570c62d1c98700d89b147459599ff25c49db9648042e8fe1372 (traefik:v1.7.22)
Tagging traefik:v1.7.22
Tagging traefik:1.7.22
Tagging traefik:v1.7
Tagging traefik:1.7
Tagging traefik:maroilles

$ test/run.sh traefik:v1.7.22
testing traefik:v1.7.22
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed

@yosifkit yosifkit merged commit e4ba75a into docker-library:master Mar 19, 2020
@ldez ldez deleted the traefik-new-version-1462e946e3f26e1f9e1304b871ae5601f2ea51c9 branch March 19, 2020 23:07
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.

4 participants