-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.3.0 #8762
Merged
Merged
Bump Traefik to v2.3.0 #8762
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbdoumenjou
approved these changes
Sep 23, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Diff for 83da7d7:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 50d5a76..10b857a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -13,29 +13,16 @@ GitCommit: b8acd6164a229d1a351ad635b471bbdd6d35e687
Directory: windows/1809
Constraints: windowsservercore-1809
-Tags: v2.2.11, 2.2.11, v2.2, 2.2, chevrotin, latest
-Architectures: amd64, arm32v6, arm64v8
-GitRepo: https://github.com/containous/traefik-library-image.git
-GitCommit: d99fdc97173b0ba01c7da11c70598ac66a51f2db
-Directory: alpine
-
-Tags: v2.2.11-windowsservercore-1809, 2.2.11-windowsservercore-1809, v2.2-windowsservercore-1809, 2.2-windowsservercore-1809, chevrotin-windowsservercore-1809, windowsservercore-1809
-Architectures: windows-amd64
-GitRepo: https://github.com/containous/traefik-library-image.git
-GitCommit: d99fdc97173b0ba01c7da11c70598ac66a51f2db
-Directory: windows/1809
-Constraints: windowsservercore-1809
-
-Tags: v2.3.0-rc7, 2.3.0-rc7, v2.3, 2.3, picodon
+Tags: v2.3.0, 2.3.0, v2.3, 2.3, picodon, latest
Architectures: amd64, arm32v6, arm64v8
GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: f26172e964d241b20aec31561a159886d8a9b681
+GitCommit: 6827292e34bb173568e72f20281897946d635e4a
Directory: alpine
-Tags: v2.3.0-rc7-windowsservercore-1809, 2.3.0-rc6-windowsservercore-1809, v2.3-windowsservercore-1809, 2.3-windowsservercore-1809, picodon-windowsservercore-1809
+Tags: v2.3.0-windowsservercore-1809, 2.3.0-windowsservercore-1809, v2.3-windowsservercore-1809, 2.3-windowsservercore-1809, picodon-windowsservercore-1809, windowsservercore-1809
Architectures: windows-amd64
GitRepo: https://github.com/traefik/traefik-library-image.git
-GitCommit: f26172e964d241b20aec31561a159886d8a9b681
+GitCommit: 6827292e34bb173568e72f20281897946d635e4a
Directory: windows/1809
Constraints: windowsservercore-1809
diff --git a/_bashbrew-list b/_bashbrew-list
index a070594..d434877 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,16 +4,10 @@ traefik:1.7-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.11
-traefik:2.2.11-windowsservercore-1809
traefik:2.3
traefik:2.3-windowsservercore-1809
-traefik:2.3.0-rc6-windowsservercore-1809
-traefik:2.3.0-rc7
-traefik:chevrotin
-traefik:chevrotin-windowsservercore-1809
+traefik:2.3.0
+traefik:2.3.0-windowsservercore-1809
traefik:latest
traefik:maroilles
traefik:maroilles-alpine
@@ -26,12 +20,8 @@ traefik:v1.7-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.11
-traefik:v2.2.11-windowsservercore-1809
traefik:v2.3
traefik:v2.3-windowsservercore-1809
-traefik:v2.3.0-rc7
-traefik:v2.3.0-rc7-windowsservercore-1809
+traefik:v2.3.0
+traefik:v2.3.0-windowsservercore-1809
traefik:windowsservercore-1809
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index 7ada7ae..8aebb1a 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.11/traefik_v2.2.11_linux_$arch.tar.gz"; \
+ wget --quiet -O /tmp/traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v2.3.0/traefik_v2.3.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
@@ -18,9 +18,9 @@ ENTRYPOINT ["/entrypoint.sh"]
CMD ["traefik"]
# Metadata
-LABEL org.opencontainers.image.vendor="Containous" \
+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.2.11" \
+ org.opencontainers.image.version="v2.3.0" \
org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_picodon-windowsservercore-1809/Dockerfile b/traefik_picodon-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 89b85fd..0000000
diff --git a/traefik_picodon/Dockerfile b/traefik_picodon/Dockerfile
deleted file mode 100644
index a48e327..0000000
diff --git a/traefik_picodon/entrypoint.sh b/traefik_picodon/entrypoint.sh
deleted file mode 100755
index 72b0b69..0000000
diff --git a/traefik_windowsservercore-1809/Dockerfile b/traefik_windowsservercore-1809/Dockerfile
index c251249..d6afe05 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.11/traefik_v2.2.11_windows_amd64.zip" \
+ -Uri "https://github.com/traefik/traefik/releases/download/v2.3.0/traefik_v2.3.0_windows_amd64.zip" \
-OutFile "/traefik.zip"; \
Expand-Archive -Path "/traefik.zip" -DestinationPath "/" -Force; \
Remove-Item "/traefik.zip" -Force
@@ -11,9 +11,9 @@ EXPOSE 80
ENTRYPOINT [ "/traefik" ]
# Metadata
-LABEL org.opencontainers.image.vendor="Containous" \
+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.2.11" \
+ org.opencontainers.image.version="v2.3.0" \
org.opencontainers.image.documentation="https://docs.traefik.io" |
mmatur
approved these changes
Sep 23, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello,
This PR updates Traefik to v2.3.0.
/cc @mmatur @SantoDE @jbdoumenjou @rtribotte
Cheers