Bump Traefik to v1.7.15 #6622
Merged
Bump Traefik to v1.7.15 #6622
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-list b/_bashbrew-list
index 0d80710..ac5b9cd 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
traefik:1.7
traefik:1.7-alpine
-traefik:1.7.14
-traefik:1.7.14-alpine
+traefik:1.7.15
+traefik:1.7.15-alpine
traefik:2.0
traefik:2.0-alpine
traefik:2.0.0-rc3
@@ -14,8 +14,8 @@ traefik:montdor
traefik:montdor-alpine
traefik:v1.7
traefik:v1.7-alpine
-traefik:v1.7.14
-traefik:v1.7.14-alpine
+traefik:v1.7.15
+traefik:v1.7.15-alpine
traefik:v2.0
traefik:v2.0-alpine
traefik:v2.0.0-rc3
diff --git a/traefik_alpine/Dockerfile b/traefik_alpine/Dockerfile
index 73863bf..76a376a 100644
--- a/traefik_alpine/Dockerfile
+++ b/traefik_alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
RUN apk --no-cache add ca-certificates tzdata
RUN set -ex; \
apkArch="$(apk --print-arch)"; \
@@ -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.14/traefik_linux-$arch"; \
+ wget --quiet -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/v1.7.15/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.14" \
+ org.opencontainers.image.version="v1.7.15" \
org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_latest/Dockerfile b/traefik_latest/Dockerfile
index b2e5b6e..9a1b98b 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_latest/Dockerfile
@@ -1,6 +1,8 @@
FROM scratch
-COPY certs/ca-certificates.crt /etc/ssl/certs/
-COPY traefik /
+COPY --from=traefik:v1.7.15-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=traefik:v1.7.15-alpine /usr/share/zoneinfo /usr/share/
+COPY --from=traefik:v1.7.15-alpine /usr/local/bin/traefik /
+
EXPOSE 80
VOLUME ["/tmp"]
ENTRYPOINT ["/traefik"]
@@ -10,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.14" \
+ org.opencontainers.image.version="v1.7.15" \
org.opencontainers.image.documentation="https://docs.traefik.io"
diff --git a/traefik_latest/certs/ca-certificates.crt b/traefik_latest/certs/ca-certificates.crt
deleted file mode 100644
index a4e2acc..0000000
diff --git a/traefik_latest/traefik b/traefik_latest/traefik
deleted file mode 100755
index d7d8822..0000000 |
|
Build test of #6622; 6b2862a; $ bashbrew build traefik:v2.0.0-rc3-alpine
Using bashbrew/cache:797aff20de182aaec8e21178638c0b897680faa6690cf94ae87b18427fe4758e (traefik:v2.0.0-rc3-alpine)
Tagging traefik:v2.0.0-rc3-alpine
Tagging traefik:2.0.0-rc3-alpine
Tagging traefik:v2.0-alpine
Tagging traefik:2.0-alpine
Tagging traefik:montdor-alpine
$ test/run.sh traefik:v2.0.0-rc3-alpine
testing traefik:v2.0.0-rc3-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.15-alpine
Building bashbrew/cache:fbad7b0c727b4bf177faa8768f88dd3750d32b69c9b1a200464ebf182d148edf (traefik:v1.7.15-alpine)
Tagging traefik:v1.7.15-alpine
Tagging traefik:1.7.15-alpine
Tagging traefik:v1.7-alpine
Tagging traefik:1.7-alpine
Tagging traefik:maroilles-alpine
Tagging traefik:alpine
$ test/run.sh traefik:v1.7.15-alpine
testing traefik:v1.7.15-alpine
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...= 'echo' is not a Traefik command: assuming shell execution.
passed
$ bashbrew build traefik:v2.0.0-rc3
Using bashbrew/cache:1164f1c3d682b871bede1ddac3c93079decc6f221976846003b4bda4e60a1a04 (traefik:v2.0.0-rc3)
Tagging traefik:v2.0.0-rc3
Tagging traefik:2.0.0-rc3
Tagging traefik:v2.0
Tagging traefik:2.0
Tagging traefik:montdor
$ test/run.sh traefik:v2.0.0-rc3
testing traefik:v2.0.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.15
Building bashbrew/cache:9112cabd50bfab67a44e788f599a2a0c22abbb6d3a3e66900f7321513cd41d9a (traefik:v1.7.15)
Tagging traefik:v1.7.15
Tagging traefik:1.7.15
Tagging traefik:v1.7
Tagging traefik:1.7
Tagging traefik:maroilles
Tagging traefik:latest
$ test/run.sh traefik:v1.7.15
testing traefik:v1.7.15
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed
|
|
If you could also merge the documentation (docker-library/docs#1570) it would be great. Thanks. I also see that the Jenkins queue is huge https://doi-janky.infosiftr.net/, is it related to something? |
|
The queue would be because of Debian (#6617). I am unsure how long it will take to clear. |
|
@yosifkit is it possible that amd64 images were tagged for latest but not for e.g. traefik:1.7.15 even tough the build log states it? |
|
I agree with @zyclonite, I think there is an issue with some tags: from scratch traefik:1.7.15 [missing amd64]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:1.7.15
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:055d887a245323e6b5192cc373c075ff62ec6910d3f29087539f2a72dbeca193",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:167b2223ee5ea004ca8240d22c6b78e08e5d83a5e32866e6acb55668d8865174",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}
traefik:v1.7.15 [missing amd64]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:v1.7.15
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:055d887a245323e6b5192cc373c075ff62ec6910d3f29087539f2a72dbeca193",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:167b2223ee5ea004ca8240d22c6b78e08e5d83a5e32866e6acb55668d8865174",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}traefik:v1.7 [OK]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:v1.7
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 739,
"digest": "sha256:2911f8e1a2d22aeba50126ea6c0883a943cf02912df6c566620ef36fcac3c2a8",
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:055d887a245323e6b5192cc373c075ff62ec6910d3f29087539f2a72dbeca193",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:167b2223ee5ea004ca8240d22c6b78e08e5d83a5e32866e6acb55668d8865174",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}traefik:1.7 [OK]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:1.7
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 739,
"digest": "sha256:2911f8e1a2d22aeba50126ea6c0883a943cf02912df6c566620ef36fcac3c2a8",
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:055d887a245323e6b5192cc373c075ff62ec6910d3f29087539f2a72dbeca193",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:167b2223ee5ea004ca8240d22c6b78e08e5d83a5e32866e6acb55668d8865174",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}
traefik:maroilles [OK]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:maroilles
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 739,
"digest": "sha256:2911f8e1a2d22aeba50126ea6c0883a943cf02912df6c566620ef36fcac3c2a8",
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:055d887a245323e6b5192cc373c075ff62ec6910d3f29087539f2a72dbeca193",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:167b2223ee5ea004ca8240d22c6b78e08e5d83a5e32866e6acb55668d8865174",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}
traefik:latest [OK]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:latest
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 739,
"digest": "sha256:2911f8e1a2d22aeba50126ea6c0883a943cf02912df6c566620ef36fcac3c2a8",
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:055d887a245323e6b5192cc373c075ff62ec6910d3f29087539f2a72dbeca193",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:167b2223ee5ea004ca8240d22c6b78e08e5d83a5e32866e6acb55668d8865174",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}alpine traefik:v1.7.15-alpine [missing amd64]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:v1.7.15-alpine
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:41e1a27e0099ca8b2b4e35d1964dab79eb248e0668ebbf0c00e89df30f63e619",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:fadb83afb1e3e44f61ab0c16d101f0ec43b5647b9dd9a60e62ed6ffbe70ebce5",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}
traefik:1.7.15-alpine [OK]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:1.7.15-alpine
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:73a41a5247ba146e6f597e9a37ffc96215aade82dcc5022c5d54aa21776db15c",
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:41e1a27e0099ca8b2b4e35d1964dab79eb248e0668ebbf0c00e89df30f63e619",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:fadb83afb1e3e44f61ab0c16d101f0ec43b5647b9dd9a60e62ed6ffbe70ebce5",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}
traefik:v1.7-alpine [OK]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:v1.7-alpine
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:73a41a5247ba146e6f597e9a37ffc96215aade82dcc5022c5d54aa21776db15c",
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:41e1a27e0099ca8b2b4e35d1964dab79eb248e0668ebbf0c00e89df30f63e619",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:fadb83afb1e3e44f61ab0c16d101f0ec43b5647b9dd9a60e62ed6ffbe70ebce5",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}
traefik:1.7-alpine [OK]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:1.7-alpine
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:73a41a5247ba146e6f597e9a37ffc96215aade82dcc5022c5d54aa21776db15c",
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:41e1a27e0099ca8b2b4e35d1964dab79eb248e0668ebbf0c00e89df30f63e619",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:fadb83afb1e3e44f61ab0c16d101f0ec43b5647b9dd9a60e62ed6ffbe70ebce5",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}
traefik:maroilles-alpine [OK]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:maroilles-alpine
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:73a41a5247ba146e6f597e9a37ffc96215aade82dcc5022c5d54aa21776db15c",
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:41e1a27e0099ca8b2b4e35d1964dab79eb248e0668ebbf0c00e89df30f63e619",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:fadb83afb1e3e44f61ab0c16d101f0ec43b5647b9dd9a60e62ed6ffbe70ebce5",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}
traefik:alpine [OK]$ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:alpine
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:73a41a5247ba146e6f597e9a37ffc96215aade82dcc5022c5d54aa21776db15c",
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:41e1a27e0099ca8b2b4e35d1964dab79eb248e0668ebbf0c00e89df30f63e619",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 1157,
"digest": "sha256:fadb83afb1e3e44f61ab0c16d101f0ec43b5647b9dd9a60e62ed6ffbe70ebce5",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
}
|
|
@zyclonite the problem seems to be fixed: DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect traefik:v1.7.15
{
"schemaVersion": 2,
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
"manifests": [
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:03de6ecd8919e8fea7b084686ebfc30bba32d37b0a47477d7bca30dcb98a2b74",
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:055d887a245323e6b5192cc373c075ff62ec6910d3f29087539f2a72dbeca193",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v6"
}
},
{
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"size": 949,
"digest": "sha256:167b2223ee5ea004ca8240d22c6b78e08e5d83a5e32866e6acb55668d8865174",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
}
}
]
} |
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.15.
/cc @mmatur @emilevauge @juliens
Cheers