Bump Traefik to v1.7.0-rc3 #4664
Merged
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
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 8fd1046..9a58598 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -10,3 +10,4 @@ traefik:maroilles @ arm64v8
traefik:maroilles-alpine @ amd64
traefik:maroilles-alpine @ arm32v6
traefik:maroilles-alpine @ arm64v8
+traefik:maroilles-nanoserver-sac2016 @ windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 86abfa5..1c9d725 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,12 +4,18 @@ traefik:1.6.5
traefik:1.6.5-alpine
traefik:1.7
traefik:1.7-alpine
-traefik:1.7.0-rc2
-traefik:1.7.0-rc2-alpine
+traefik:1.7-nanoserver
+traefik:1.7-nanoserver-sac2016
+traefik:1.7.0-rc3
+traefik:1.7.0-rc3-alpine
+traefik:1.7.0-rc3-nanoserver
+traefik:1.7.0-rc3-nanoserver-sac2016
traefik:alpine
traefik:latest
traefik:maroilles
traefik:maroilles-alpine
+traefik:maroilles-nanoserver
+traefik:maroilles-nanoserver-sac2016
traefik:tetedemoine
traefik:tetedemoine-alpine
traefik:v1.6
@@ -18,5 +24,9 @@ traefik:v1.6.5
traefik:v1.6.5-alpine
traefik:v1.7
traefik:v1.7-alpine
-traefik:v1.7.0-rc2
-traefik:v1.7.0-rc2-alpine
+traefik:v1.7-nanoserver
+traefik:v1.7-nanoserver-sac2016
+traefik:v1.7.0-rc3
+traefik:v1.7.0-rc3-alpine
+traefik:v1.7.0-rc3-nanoserver
+traefik:v1.7.0-rc3-nanoserver-sac2016
diff --git a/traefik_v1.7.0-rc2-alpine/Dockerfile b/traefik_v1.7.0-rc3-alpine/Dockerfile
similarity index 88%
rename from traefik_v1.7.0-rc2-alpine/Dockerfile
rename to traefik_v1.7.0-rc3-alpine/Dockerfile
index 10a6043..b4e0beb 100644
--- a/traefik_v1.7.0-rc2-alpine/Dockerfile
+++ b/traefik_v1.7.0-rc3-alpine/Dockerfile
@@ -9,7 +9,7 @@ RUN set -ex; \
*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
esac; \
apk add --no-cache --virtual .fetch-deps libressl; \
- wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.7.0-rc2/traefik_linux-$arch"; \
+ wget -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.7.0-rc3/traefik_linux-$arch"; \
apk del .fetch-deps; \
chmod +x /usr/local/bin/traefik
COPY entrypoint.sh /
@@ -22,5 +22,5 @@ LABEL org.label-schema.vendor="Containous" \
org.label-schema.url="https://traefik.io" \
org.label-schema.name="Traefik" \
org.label-schema.description="A modern reverse-proxy" \
- org.label-schema.version="v1.7.0-rc2" \
+ org.label-schema.version="v1.7.0-rc3" \
org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_v1.7.0-rc2-alpine/entrypoint.sh b/traefik_v1.7.0-rc3-alpine/entrypoint.sh
similarity index 75%
rename from traefik_v1.7.0-rc2-alpine/entrypoint.sh
rename to traefik_v1.7.0-rc3-alpine/entrypoint.sh
index 49b3a32..0e7fff6 100755
--- a/traefik_v1.7.0-rc2-alpine/entrypoint.sh
+++ b/traefik_v1.7.0-rc3-alpine/entrypoint.sh
@@ -8,8 +8,8 @@ fi
# if our command is a valid Traefik subcommand, let's invoke it through Traefik instead
# (this allows for "docker run traefik version", etc)
-if traefik "$1" --help 2>&1 >/dev/null | grep "help requested" > /dev/null 2>&1; then
+if traefik "$1" --help | grep -s -q "help"; then
set -- traefik "$@"
fi
-exec "$@"
\ No newline at end of file
+exec "$@"
diff --git a/traefik_v1.7.0-rc2/Dockerfile b/traefik_v1.7.0-rc3-nanoserver/Dockerfile
similarity index 66%
copy from traefik_v1.7.0-rc2/Dockerfile
copy to traefik_v1.7.0-rc3-nanoserver/Dockerfile
index e31f36b..6fd1adc 100644
--- a/traefik_v1.7.0-rc2/Dockerfile
+++ b/traefik_v1.7.0-rc3-nanoserver/Dockerfile
@@ -1,6 +1,10 @@
-FROM scratch
-COPY certs/ca-certificates.crt /etc/ssl/certs/
-COPY traefik /
+FROM microsoft/nanoserver:sac2016
+
+COPY ./traefik /traefik.exe
+
+VOLUME C:/etc/traefik
+VOLUME C:/etc/ssl
+
EXPOSE 80
ENTRYPOINT ["/traefik"]
@@ -9,5 +13,5 @@ LABEL org.label-schema.vendor="Containous" \
org.label-schema.url="https://traefik.io" \
org.label-schema.name="Traefik" \
org.label-schema.description="A modern reverse-proxy" \
- org.label-schema.version="v1.7.0-rc2" \
+ org.label-schema.version="v1.7.0-rc3" \
org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_v1.7.0-rc2/traefik b/traefik_v1.7.0-rc3-nanoserver/traefik
similarity index 79%
copy from traefik_v1.7.0-rc2/traefik
copy to traefik_v1.7.0-rc3-nanoserver/traefik
index 2175480..6bb2504 100755
Binary files a/traefik_v1.7.0-rc2/traefik and b/traefik_v1.7.0-rc3-nanoserver/traefik differ
diff --git a/traefik_v1.7.0-rc2/Dockerfile b/traefik_v1.7.0-rc3/Dockerfile
similarity index 88%
rename from traefik_v1.7.0-rc2/Dockerfile
rename to traefik_v1.7.0-rc3/Dockerfile
index e31f36b..29481e4 100644
--- a/traefik_v1.7.0-rc2/Dockerfile
+++ b/traefik_v1.7.0-rc3/Dockerfile
@@ -9,5 +9,5 @@ LABEL org.label-schema.vendor="Containous" \
org.label-schema.url="https://traefik.io" \
org.label-schema.name="Traefik" \
org.label-schema.description="A modern reverse-proxy" \
- org.label-schema.version="v1.7.0-rc2" \
+ org.label-schema.version="v1.7.0-rc3" \
org.label-schema.docker.schema-version="1.0"
diff --git a/traefik_v1.7.0-rc2/certs/ca-certificates.crt b/traefik_v1.7.0-rc3/certs/ca-certificates.crt
similarity index 100%
rename from traefik_v1.7.0-rc2/certs/ca-certificates.crt
rename to traefik_v1.7.0-rc3/certs/ca-certificates.crt
diff --git a/traefik_v1.7.0-rc2/traefik b/traefik_v1.7.0-rc3/traefik
similarity index 82%
rename from traefik_v1.7.0-rc2/traefik
rename to traefik_v1.7.0-rc3/traefik
index 2175480..46ed316 100755
Binary files a/traefik_v1.7.0-rc2/traefik and b/traefik_v1.7.0-rc3/traefik differ |
+VOLUME C:/etc/traefik
+VOLUME C:/etc/sslThis seems a little strange given that the other non-Windows variants don't include +COPY ./traefik /traefik.exeIs it also intentional that the in-repo copy of |
|
Hello @tianon ! Thanks for the careful review!
|
|
Those two paths are typically for configuration, right? (not data storage) So if they're defined as |
|
@tianon I think we can merge it as is, we will discuss on a possible enhancement for the next release candidate :) |
|
Aight, LGTM 👍 Build test of #4664; e257380; $ bashbrew build traefik:v1.7.0-rc3
Building bashbrew/cache:42eda9cb7079e012f2772202633f90aef118c463192b936991f8c9ab52927651 (traefik:v1.7.0-rc3)
Tagging traefik:v1.7.0-rc3
Tagging traefik:1.7.0-rc3
Tagging traefik:v1.7
Tagging traefik:1.7
Tagging traefik:maroilles
$ test/run.sh traefik:v1.7.0-rc3
testing traefik:v1.7.0-rc3
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed
$ bashbrew build traefik:v1.7.0-rc3-alpine
Building bashbrew/cache:37f293ad1644eb0b737924dcf849e4a07e48603cd867b1e2c0b8f70d87cc0cfa (traefik:v1.7.0-rc3-alpine)
Tagging traefik:v1.7.0-rc3-alpine
Tagging traefik:1.7.0-rc3-alpine
Tagging traefik:v1.7-alpine
Tagging traefik:1.7-alpine
Tagging traefik:maroilles-alpine
$ test/run.sh traefik:v1.7.0-rc3-alpine
testing traefik:v1.7.0-rc3-alpine
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...2018/08/02 17:31:51 command echo not found
passed
$ bashbrew build traefik:v1.7.0-rc3-nanoserver
skipping "traefik:v1.7.0-rc3-nanoserver" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh traefik:v1.7.0-rc3-nanoserver
testing traefik:v1.7.0-rc3-nanoserver
image does not exist!
$ bashbrew build traefik:v1.6.5
Using bashbrew/cache:7d77a2ae55da9b1fe1ef388a3adb2c96f936e5b8eccd20833e55103fc08ec54a (traefik:v1.6.5)
Tagging traefik:v1.6.5
Tagging traefik:1.6.5
Tagging traefik:v1.6
Tagging traefik:1.6
Tagging traefik:tetedemoine
Tagging traefik:latest
$ test/run.sh traefik:v1.6.5
testing traefik:v1.6.5
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed
$ bashbrew build traefik:v1.6.5-alpine
Using bashbrew/cache:114c600e7ab4900374c8cbfdcabac1cd0177d5f4f1e12430cbf2ede37a47672a (traefik:v1.6.5-alpine)
Tagging traefik:v1.6.5-alpine
Tagging traefik:1.6.5-alpine
Tagging traefik:v1.6-alpine
Tagging traefik:1.6-alpine
Tagging traefik:tetedemoine-alpine
Tagging traefik:alpine
$ test/run.sh traefik:v1.6.5-alpine
testing traefik:v1.6.5-alpine
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...passed
The following images failed at least one test:
|
|
Thanks @tianon I can't remember why I used/tried it with |
|
@seal-ss don't worry, we got this: containous/traefik-library-image#34 (for the rc4 ). |
mmatur
deleted the
traefik-new-version-6dadcaf64497da64d2283f2e86302798554f1539
branch
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 v1.7.0-rc3.
And adds the windows docker image (superseeds #4650).
And adds @dduportal as maintainer
/cc @vdemeester @emilevauge @ldez
Cheers