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.

Sign up for GitHub

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

Jump to bottom

Bump Traefik to v1.7.26 and v2.2.8 #8445

Merged
merged 3 commits into from
Jul 28, 2020
Merged

Bump Traefik to v1.7.26 and v2.2.8 #8445

merged 3 commits into from
Jul 28, 2020

Conversation

jbdoumenjou
Copy link
Contributor

@jbdoumenjou jbdoumenjou commented Jul 28, 2020 •
edited
Loading

Hello,

This PR updates Traefik to v1.7.26 and v2.2.8.

/cc @ldez @mmatur @juliens

Cheers

mmatur
mmatur approved these changes Jul 28, 2020
View reviewed changes
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

ldez
ldez approved these changes Jul 28, 2020
View reviewed changes
Copy link
Contributor

@ldez ldez left a comment

Choose a reason for hiding this comment

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

LGTM

@jbdoumenjou jbdoumenjou changed the title Bump Traefik to v1.7.26 Bump Traefik to v1.7.26 and v2.2.8 Jul 28, 2020
@github-actions
Copy link

Diff for 185f1a8: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index f32841c..59a9daa 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,40 +1,40 @@
 Maintainers: Emile Vauge <emile@vauge.com> (@emilevauge), Vincent Demeester <vincent@sbr.pm> (@vdemeester), Ludovic Fernandez <ludovic@containo.us> (@ldez), Julien Salleyron <julien@containo.us> (@juliens), Nicolas Mengin <nicolas@containo.us> (@nmengin), Michael Matur <michael@containo.us> (@mmatur)
 GitRepo: https://github.com/containous/traefik-library-image.git
 
-Tags: v1.7.25-alpine, 1.7.25-alpine, v1.7-alpine, 1.7-alpine, maroilles-alpine
+Tags: v1.7.26-alpine, 1.7.26-alpine, v1.7-alpine, 1.7-alpine, maroilles-alpine
 Architectures: amd64, arm32v6, arm64v8
-GitCommit: 9ac00ce5eb8e85bc017d521eb9a57a5a9cd6298f
+GitCommit: b8acd6164a229d1a351ad635b471bbdd6d35e687
 Directory: alpine
 
-Tags: v1.7.25-windowsservercore-1809, 1.7.25-windowsservercore-1809, v1.7-windowsservercore-1809, 1.7-windowsservercore-1809, maroilles-windowsservercore-1809
+Tags: v1.7.26-windowsservercore-1809, 1.7.26-windowsservercore-1809, v1.7-windowsservercore-1809, 1.7-windowsservercore-1809, maroilles-windowsservercore-1809
 Architectures: windows-amd64
-GitCommit: 9ac00ce5eb8e85bc017d521eb9a57a5a9cd6298f
+GitCommit: b8acd6164a229d1a351ad635b471bbdd6d35e687
 Directory: windows/1809
 Constraints: windowsservercore-1809
 
-Tags: v2.2.7, 2.2.7, v2.2, 2.2, chevrotin, latest
+Tags: v2.2.8, 2.2.8, v2.2, 2.2, chevrotin, latest
 Architectures: amd64, arm32v6, arm64v8
-GitCommit: 7a86a2ad2473d95a31ac9cda52bc5d540916c233
+GitCommit: 3a918cb6253b82d01d5423266875617aeda0f1bc
 Directory: alpine
 
-Tags: v2.2.7-windowsservercore-1809, 2.2.7-windowsservercore-1809, v2.2-windowsservercore-1809, 2.2-windowsservercore-1809, chevrotin-windowsservercore-1809, windowsservercore-1809
+Tags: v2.2.8-windowsservercore-1809, 2.2.8-windowsservercore-1809, v2.2-windowsservercore-1809, 2.2-windowsservercore-1809, chevrotin-windowsservercore-1809, windowsservercore-1809
 Architectures: windows-amd64
-GitCommit: 7a86a2ad2473d95a31ac9cda52bc5d540916c233
+GitCommit: 3a918cb6253b82d01d5423266875617aeda0f1bc
 Directory: windows/1809
 Constraints: windowsservercore-1809
 
-Tags: v2.3.0-rc2, 2.3.0-rc2, v2.3, 2.3, picodon
+Tags: v2.3.0-rc3, 2.3.0-rc3, v2.3, 2.3, picodon
 Architectures: amd64, arm32v6, arm64v8
-GitCommit: 5efcbc047ba54b98034add180d446af2ec7d885a
+GitCommit: 06e008a7576a80d08e21c8592bfdca03b9707e09
 Directory: alpine
 
-Tags: v2.3.0-rc2-windowsservercore-1809, 2.3.0-rc2-windowsservercore-1809, v2.3-windowsservercore-1809, 2.3-windowsservercore-1809, picodon-windowsservercore-1809
+Tags: v2.3.0-rc3-windowsservercore-1809, 2.3.0-rc3-windowsservercore-1809, v2.3-windowsservercore-1809, 2.3-windowsservercore-1809, picodon-windowsservercore-1809
 Architectures: windows-amd64
-GitCommit: 5efcbc047ba54b98034add180d446af2ec7d885a
+GitCommit: 06e008a7576a80d08e21c8592bfdca03b9707e09
 Directory: windows/1809
 Constraints: windowsservercore-1809
 
-Tags: v1.7.25, 1.7.25, v1.7, 1.7, maroilles
+Tags: v1.7.26, 1.7.26, v1.7, 1.7, maroilles
 Architectures: amd64, arm32v6, arm64v8
-GitCommit: 9ac00ce5eb8e85bc017d521eb9a57a5a9cd6298f
+GitCommit: b8acd6164a229d1a351ad635b471bbdd6d35e687
 Directory: scratch
diff --git a/_bashbrew-list b/_bashbrew-list
index 54fad05..71f3b03 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,17 +1,17 @@
 traefik:1.7
 traefik:1.7-alpine
 traefik:1.7-windowsservercore-1809
-traefik:1.7.25
-traefik:1.7.25-alpine
-traefik:1.7.25-windowsservercore-1809
+traefik:1.7.26
+traefik:1.7.26-alpine
+traefik:1.7.26-windowsservercore-1809
 traefik:2.2
 traefik:2.2-windowsservercore-1809
-traefik:2.2.7
-traefik:2.2.7-windowsservercore-1809
+traefik:2.2.8
+traefik:2.2.8-windowsservercore-1809
 traefik:2.3
 traefik:2.3-windowsservercore-1809
-traefik:2.3.0-rc2
-traefik:2.3.0-rc2-windowsservercore-1809
+traefik:2.3.0-rc3
+traefik:2.3.0-rc3-windowsservercore-1809
 traefik:chevrotin
 traefik:chevrotin-windowsservercore-1809
 traefik:latest
@@ -23,15 +23,15 @@ traefik:picodon-windowsservercore-1809
 traefik:v1.7
 traefik:v1.7-alpine
 traefik:v1.7-windowsservercore-1809
-traefik:v1.7.25
-traefik:v1.7.25-alpine
-traefik:v1.7.25-windowsservercore-1809
+traefik:v1.7.26
+traefik:v1.7.26-alpine
+traefik:v1.7.26-windowsservercore-1809
 traefik:v2.2
 traefik:v2.2-windowsservercore-1809
-traefik:v2.2.7
-traefik:v2.2.7-windowsservercore-1809
+traefik:v2.2.8
+traefik:v2.2.8-windowsservercore-1809
 traefik:v2.3
 traefik:v2.3-windowsservercore-1809
-traefik:v2.3.0-rc2
-traefik:v2.3.0-rc2-windowsservercore-1809
+traefik:v2.3.0-rc3
+traefik:v2.3.0-rc3-windowsservercore-1809
 traefik:windowsservercore-1809
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index ad9c549..5b2de88 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.2.7/traefik_v2.2.7_linux_$arch.tar.gz"; \
+	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.2.8/traefik_v2.2.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.2.7" \
+	org.opencontainers.image.version="v2.2.8" \
 	org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_maroilles-alpine/Dockerfile b/traefik_maroilles-alpine/Dockerfile
index 44d2767..0d50098 100644
--- a/traefik_maroilles-alpine/Dockerfile
+++ b/traefik_maroilles-alpine/Dockerfile
@@ -8,7 +8,7 @@ RUN set -ex; \
 		x86_64) arch='amd64' ;; \
 		*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
 	esac; \
-	wget --quiet -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.7.25/traefik_linux-$arch"; \
+	wget --quiet -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.7.26/traefik_linux-$arch"; \
 	chmod +x /usr/local/bin/traefik
 COPY entrypoint.sh /
 EXPOSE 80
@@ -20,5 +20,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="v1.7.25" \
+	org.opencontainers.image.version="v1.7.26" \
 	org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_maroilles-windowsservercore-1809/Dockerfile b/traefik_maroilles-windowsservercore-1809/Dockerfile
index 35fa2ff..8231849 100644
--- a/traefik_maroilles-windowsservercore-1809/Dockerfile
+++ b/traefik_maroilles-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/containous/traefik/releases/download/v1.7.25/traefik_windows-amd64.exe" \
+    -Uri "https://github.com/containous/traefik/releases/download/v1.7.26/traefik_windows-amd64.exe" \
     -OutFile "/traefik.exe"
 
 EXPOSE 80
@@ -13,5 +13,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="v1.7.25" \
+    org.opencontainers.image.version="v1.7.26" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_maroilles/Dockerfile b/traefik_maroilles/Dockerfile
index 9e79dff..589aecc 100644
--- a/traefik_maroilles/Dockerfile
+++ b/traefik_maroilles/Dockerfile
@@ -1,7 +1,7 @@
 FROM scratch
-COPY --from=traefik:v1.7.25-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=traefik:v1.7.25-alpine /usr/share/zoneinfo /usr/share/
-COPY --from=traefik:v1.7.25-alpine /usr/local/bin/traefik /
+COPY --from=traefik:v1.7.26-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=traefik:v1.7.26-alpine /usr/share/zoneinfo /usr/share/
+COPY --from=traefik:v1.7.26-alpine /usr/local/bin/traefik /
 
 EXPOSE 80
 VOLUME ["/tmp"]
@@ -12,5 +12,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="v1.7.25" \
+	org.opencontainers.image.version="v1.7.26" \
 	org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_picodon-windowsservercore-1809/Dockerfile b/traefik_picodon-windowsservercore-1809/Dockerfile
index 65cb690..d0d28b0 100644
--- a/traefik_picodon-windowsservercore-1809/Dockerfile
+++ b/traefik_picodon-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/containous/traefik/releases/download/v2.3.0-rc2/traefik_v2.3.0-rc2_windows_amd64.zip" \
+        -Uri "https://github.com/containous/traefik/releases/download/v2.3.0-rc3/traefik_v2.3.0-rc3_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="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.3.0-rc2" \
+    org.opencontainers.image.version="v2.3.0-rc3" \
     org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_picodon/Dockerfile b/traefik_picodon/Dockerfile
index eecb839..2a01265 100644
--- a/traefik_picodon/Dockerfile
+++ b/traefik_picodon/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.3.0-rc2/traefik_v2.3.0-rc2_linux_$arch.tar.gz"; \
+	wget --quiet -O /tmp/traefik.tar.gz "https://github.com/containous/traefik/releases/download/v2.3.0-rc3/traefik_v2.3.0-rc3_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.3.0-rc2" \
+	org.opencontainers.image.version="v2.3.0-rc3" \
 	org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_windowsservercore-1809/Dockerfile b/traefik_windowsservercore-1809/Dockerfile
index e107c88..005cc75 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/containous/traefik/releases/download/v2.2.7/traefik_v2.2.7_windows_amd64.zip" \
+        -Uri "https://github.com/containous/traefik/releases/download/v2.2.8/traefik_v2.2.8_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="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.7" \
+    org.opencontainers.image.version="v2.2.8" \
     org.opencontainers.image.documentation="https://docs.traefik.io"

@yosifkit yosifkit merged commit f4f792c into docker-library:master Jul 28, 2020
@ldez ldez deleted the traefik-new-version-b8acd6164a229d1a351ad635b471bbdd6d35e687 branch July 29, 2020 07:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmatur mmatur mmatur approved these changes

@ldez ldez ldez approved these changes

Assignees
No one assigned
Labels
library/traefik
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jbdoumenjou @mmatur @ldez @yosifkit