From fe8e0c238dbdd48d851e3279722cc2cfdbecbe5f Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 13:53:16 +0100 Subject: [PATCH 01/24] fix(dns): /etc/hosts was ignored by traefik Fix https://github.com/containous/traefik/issues/6001 ### What does this PR do? It create the missing `/etc/nsswitch.conf`. ### Motivation During proxying, traefik is performing a DNS resolution. This DNS resolution is skipping `/etc/hosts` file. This can cause unwanted DNS resolution, especially when using hostname as fqdn in marathon. If you use `/etc/hosts` file for some resolution, this will fix it. If you use a real fqdn in marathon on a private network, you will still have to properly configure DNS serveur in traefik host. --- scratch/tmplv2.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scratch/tmplv2.Dockerfile b/scratch/tmplv2.Dockerfile index aefc117..a233f58 100644 --- a/scratch/tmplv2.Dockerfile +++ b/scratch/tmplv2.Dockerfile @@ -14,3 +14,6 @@ LABEL org.opencontainers.image.vendor="Containous" \ org.opencontainers.image.description="A modern reverse-proxy" \ org.opencontainers.image.version="$VERSION" \ org.opencontainers.image.documentation="https://docs.traefik.io" + +## Fix nssswitch not looking at host file (See https://github.com/containous/traefik/pull/6012) +RUN echo "hosts: files dns" > /etc/nsswitch.conf From d4c89ac05a479784b9ba5907a6d85ec7250a2f28 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 13:55:40 +0100 Subject: [PATCH 02/24] fix(dns): fix hosts file resolution --- scratch/tmplv1.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scratch/tmplv1.Dockerfile b/scratch/tmplv1.Dockerfile index aefc117..23e34ff 100644 --- a/scratch/tmplv1.Dockerfile +++ b/scratch/tmplv1.Dockerfile @@ -14,3 +14,6 @@ LABEL org.opencontainers.image.vendor="Containous" \ org.opencontainers.image.description="A modern reverse-proxy" \ org.opencontainers.image.version="$VERSION" \ org.opencontainers.image.documentation="https://docs.traefik.io" + +## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik/pull/6012) +RUN echo "hosts: files dns" > /etc/nsswitch.conf From 645a3f710fe78437feb56adade624c2f8df4a427 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 13:56:06 +0100 Subject: [PATCH 03/24] fix(dns): fix hosts file resolution --- scratch/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scratch/Dockerfile b/scratch/Dockerfile index c44863d..51f34da 100644 --- a/scratch/Dockerfile +++ b/scratch/Dockerfile @@ -14,3 +14,6 @@ LABEL org.opencontainers.image.vendor="Containous" \ org.opencontainers.image.description="A modern reverse-proxy" \ org.opencontainers.image.version="v2.1.0" \ org.opencontainers.image.documentation="https://docs.traefik.io" + +## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik/pull/6012) +RUN echo "hosts: files dns" > /etc/nsswitch.conf From e5d97b6fecaa5ab46f58d2ae8f5c7c361ef06c61 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 13:56:33 +0100 Subject: [PATCH 04/24] typo(dns): comment --- scratch/tmplv2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scratch/tmplv2.Dockerfile b/scratch/tmplv2.Dockerfile index a233f58..23e34ff 100644 --- a/scratch/tmplv2.Dockerfile +++ b/scratch/tmplv2.Dockerfile @@ -15,5 +15,5 @@ LABEL org.opencontainers.image.vendor="Containous" \ org.opencontainers.image.version="$VERSION" \ org.opencontainers.image.documentation="https://docs.traefik.io" -## Fix nssswitch not looking at host file (See https://github.com/containous/traefik/pull/6012) +## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik/pull/6012) RUN echo "hosts: files dns" > /etc/nsswitch.conf From cbdb1341bd2a8c5aab6bbcc4730bb791d0797472 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 13:58:46 +0100 Subject: [PATCH 05/24] comment --- scratch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scratch/Dockerfile b/scratch/Dockerfile index 51f34da..28c82a2 100644 --- a/scratch/Dockerfile +++ b/scratch/Dockerfile @@ -15,5 +15,5 @@ LABEL org.opencontainers.image.vendor="Containous" \ org.opencontainers.image.version="v2.1.0" \ org.opencontainers.image.documentation="https://docs.traefik.io" -## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik/pull/6012) +## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) RUN echo "hosts: files dns" > /etc/nsswitch.conf From 87d3117959f1767774073eaf6599413fca75d78c Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 13:59:04 +0100 Subject: [PATCH 06/24] comment --- scratch/tmplv1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scratch/tmplv1.Dockerfile b/scratch/tmplv1.Dockerfile index 23e34ff..c70e52d 100644 --- a/scratch/tmplv1.Dockerfile +++ b/scratch/tmplv1.Dockerfile @@ -15,5 +15,5 @@ LABEL org.opencontainers.image.vendor="Containous" \ org.opencontainers.image.version="$VERSION" \ org.opencontainers.image.documentation="https://docs.traefik.io" -## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik/pull/6012) +## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) RUN echo "hosts: files dns" > /etc/nsswitch.conf From 847ccf9f1fb5e88a75e8215d9089763abff60631 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 13:59:16 +0100 Subject: [PATCH 07/24] Update tmplv2.Dockerfile --- scratch/tmplv2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scratch/tmplv2.Dockerfile b/scratch/tmplv2.Dockerfile index 23e34ff..c70e52d 100644 --- a/scratch/tmplv2.Dockerfile +++ b/scratch/tmplv2.Dockerfile @@ -15,5 +15,5 @@ LABEL org.opencontainers.image.vendor="Containous" \ org.opencontainers.image.version="$VERSION" \ org.opencontainers.image.documentation="https://docs.traefik.io" -## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik/pull/6012) +## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) RUN echo "hosts: files dns" > /etc/nsswitch.conf From 7223d9d0405926d1bcc314ce5003e058d971b828 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 15:13:13 +0100 Subject: [PATCH 08/24] fix command --- scratch/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scratch/Dockerfile b/scratch/Dockerfile index 28c82a2..d4a7476 100644 --- a/scratch/Dockerfile +++ b/scratch/Dockerfile @@ -2,6 +2,9 @@ FROM scratch COPY --from=traefik:v2.1.0-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=traefik:v2.1.0-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:v2.1.0-alpine /usr/local/bin/traefik / + +## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) +RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf EXPOSE 80 VOLUME ["/tmp"] @@ -14,6 +17,3 @@ LABEL org.opencontainers.image.vendor="Containous" \ org.opencontainers.image.description="A modern reverse-proxy" \ org.opencontainers.image.version="v2.1.0" \ org.opencontainers.image.documentation="https://docs.traefik.io" - -## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) -RUN echo "hosts: files dns" > /etc/nsswitch.conf From 039ba02e515a19d97d390b62e2f0a92f79f9d9c6 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 15:13:31 +0100 Subject: [PATCH 09/24] fix command --- scratch/tmplv1.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scratch/tmplv1.Dockerfile b/scratch/tmplv1.Dockerfile index c70e52d..caa3d8a 100644 --- a/scratch/tmplv1.Dockerfile +++ b/scratch/tmplv1.Dockerfile @@ -3,6 +3,9 @@ COPY --from=traefik:${VERSION}-alpine /etc/ssl/certs/ca-certificates.crt /etc/ss COPY --from=traefik:${VERSION}-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:${VERSION}-alpine /usr/local/bin/traefik / +## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) +RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf + EXPOSE 80 VOLUME ["/tmp"] ENTRYPOINT ["/traefik"] @@ -14,6 +17,3 @@ LABEL org.opencontainers.image.vendor="Containous" \ org.opencontainers.image.description="A modern reverse-proxy" \ org.opencontainers.image.version="$VERSION" \ org.opencontainers.image.documentation="https://docs.traefik.io" - -## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) -RUN echo "hosts: files dns" > /etc/nsswitch.conf From d6a9a4328b84d3512136bbed7d5abac902eb43ce Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 15:13:48 +0100 Subject: [PATCH 10/24] fix command --- scratch/tmplv2.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scratch/tmplv2.Dockerfile b/scratch/tmplv2.Dockerfile index c70e52d..caa3d8a 100644 --- a/scratch/tmplv2.Dockerfile +++ b/scratch/tmplv2.Dockerfile @@ -3,6 +3,9 @@ COPY --from=traefik:${VERSION}-alpine /etc/ssl/certs/ca-certificates.crt /etc/ss COPY --from=traefik:${VERSION}-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:${VERSION}-alpine /usr/local/bin/traefik / +## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) +RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf + EXPOSE 80 VOLUME ["/tmp"] ENTRYPOINT ["/traefik"] @@ -14,6 +17,3 @@ LABEL org.opencontainers.image.vendor="Containous" \ org.opencontainers.image.description="A modern reverse-proxy" \ org.opencontainers.image.version="$VERSION" \ org.opencontainers.image.documentation="https://docs.traefik.io" - -## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) -RUN echo "hosts: files dns" > /etc/nsswitch.conf From 13750548240e3364d8295c08dfa08f9973bdb340 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 21:19:10 +0100 Subject: [PATCH 11/24] Update scratch/tmplv2.Dockerfile Co-Authored-By: Damien Duportal --- scratch/tmplv2.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/scratch/tmplv2.Dockerfile b/scratch/tmplv2.Dockerfile index caa3d8a..9c8dc3e 100644 --- a/scratch/tmplv2.Dockerfile +++ b/scratch/tmplv2.Dockerfile @@ -3,7 +3,6 @@ COPY --from=traefik:${VERSION}-alpine /etc/ssl/certs/ca-certificates.crt /etc/ss COPY --from=traefik:${VERSION}-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:${VERSION}-alpine /usr/local/bin/traefik / -## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf EXPOSE 80 From 1a33d54063a33c52b38c707fd5bbda4aaa55e9f5 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 21:19:20 +0100 Subject: [PATCH 12/24] Update scratch/tmplv1.Dockerfile Co-Authored-By: Damien Duportal --- scratch/tmplv1.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/scratch/tmplv1.Dockerfile b/scratch/tmplv1.Dockerfile index caa3d8a..9c8dc3e 100644 --- a/scratch/tmplv1.Dockerfile +++ b/scratch/tmplv1.Dockerfile @@ -3,7 +3,6 @@ COPY --from=traefik:${VERSION}-alpine /etc/ssl/certs/ca-certificates.crt /etc/ss COPY --from=traefik:${VERSION}-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:${VERSION}-alpine /usr/local/bin/traefik / -## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf EXPOSE 80 From eb7660c91a0b19fc9f2d8ab09623021e6c85c614 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 21:19:30 +0100 Subject: [PATCH 13/24] Update scratch/Dockerfile Co-Authored-By: Damien Duportal --- scratch/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/scratch/Dockerfile b/scratch/Dockerfile index d4a7476..b4ca685 100644 --- a/scratch/Dockerfile +++ b/scratch/Dockerfile @@ -3,7 +3,6 @@ COPY --from=traefik:v2.1.0-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/ce COPY --from=traefik:v2.1.0-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:v2.1.0-alpine /usr/local/bin/traefik / -## Fix nssswitch not looking at hosts file (See https://github.com/containous/traefik-library-image/pull/75) RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf EXPOSE 80 From 4fc4f4157db3b0859a66065b4ece47671e6a1494 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 21:19:47 +0100 Subject: [PATCH 14/24] Update scratch/Dockerfile Co-Authored-By: Damien Duportal --- scratch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scratch/Dockerfile b/scratch/Dockerfile index b4ca685..8e101a4 100644 --- a/scratch/Dockerfile +++ b/scratch/Dockerfile @@ -3,7 +3,7 @@ COPY --from=traefik:v2.1.0-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/ce COPY --from=traefik:v2.1.0-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:v2.1.0-alpine /usr/local/bin/traefik / -RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf +COPY --from=traefik:v2.1.0-alpine /etc/nsswitch.conf /etc/nsswitch.conf EXPOSE 80 VOLUME ["/tmp"] From e5ee94e9f9430874897060eb96717761324b991b Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 21:19:55 +0100 Subject: [PATCH 15/24] Update scratch/tmplv1.Dockerfile Co-Authored-By: Damien Duportal --- scratch/tmplv1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scratch/tmplv1.Dockerfile b/scratch/tmplv1.Dockerfile index 9c8dc3e..d58954c 100644 --- a/scratch/tmplv1.Dockerfile +++ b/scratch/tmplv1.Dockerfile @@ -3,7 +3,7 @@ COPY --from=traefik:${VERSION}-alpine /etc/ssl/certs/ca-certificates.crt /etc/ss COPY --from=traefik:${VERSION}-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:${VERSION}-alpine /usr/local/bin/traefik / -RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf +COPY --from=traefik:v2.1.0-alpine /etc/nsswitch.conf /etc/nsswitch.conf EXPOSE 80 VOLUME ["/tmp"] From 80ff825c0845e63801b0fed0c8f4b5ed976f8a5a Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Thu, 12 Dec 2019 21:20:03 +0100 Subject: [PATCH 16/24] Update scratch/tmplv2.Dockerfile Co-Authored-By: Damien Duportal --- scratch/tmplv2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scratch/tmplv2.Dockerfile b/scratch/tmplv2.Dockerfile index 9c8dc3e..d58954c 100644 --- a/scratch/tmplv2.Dockerfile +++ b/scratch/tmplv2.Dockerfile @@ -3,7 +3,7 @@ COPY --from=traefik:${VERSION}-alpine /etc/ssl/certs/ca-certificates.crt /etc/ss COPY --from=traefik:${VERSION}-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:${VERSION}-alpine /usr/local/bin/traefik / -RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf +COPY --from=traefik:v2.1.0-alpine /etc/nsswitch.conf /etc/nsswitch.conf EXPOSE 80 VOLUME ["/tmp"] From 2eef5136800cba53e6880bf55d4eb21de3ebb856 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Sat, 14 Dec 2019 13:14:05 +0100 Subject: [PATCH 17/24] Update scratch/Dockerfile Co-Authored-By: Damien Duportal --- scratch/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/scratch/Dockerfile b/scratch/Dockerfile index 4a3274d..3d96f21 100644 --- a/scratch/Dockerfile +++ b/scratch/Dockerfile @@ -1,5 +1,4 @@ FROM scratch - COPY --from=traefik:v2.1.0-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=traefik:v2.1.0-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:v2.1.0-alpine /usr/local/bin/traefik / From 64f7506feb2899b7734c059ac44001269dded7a1 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Sat, 14 Dec 2019 13:15:01 +0100 Subject: [PATCH 18/24] Fix: /etc/hosts not being used on DNS resolution --- alpine/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 5b36fcc..fcfeb92 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -12,6 +12,7 @@ RUN set -ex; \ tar xzvf /tmp/traefik.tar.gz -C /usr/local/bin traefik; \ rm -f /tmp/traefik.tar.gz; \ chmod +x /usr/local/bin/traefik +RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf COPY entrypoint.sh / EXPOSE 80 ENTRYPOINT ["/entrypoint.sh"] From c075833ed82907db599b64fc609eff4d13cc528d Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Sat, 14 Dec 2019 13:15:25 +0100 Subject: [PATCH 19/24] Fix: /etc/hosts not used on DNS resolution --- alpine/tmplv1.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine/tmplv1.Dockerfile b/alpine/tmplv1.Dockerfile index e04dd39..3d34253 100644 --- a/alpine/tmplv1.Dockerfile +++ b/alpine/tmplv1.Dockerfile @@ -10,6 +10,7 @@ RUN set -ex; \ esac; \ wget --quiet -O /usr/local/bin/traefik "https://github.com/containous/traefik/releases/download/$VERSION/traefik_linux-$arch"; \ chmod +x /usr/local/bin/traefik +RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf COPY entrypoint.sh / EXPOSE 80 ENTRYPOINT ["/entrypoint.sh"] From 15f38125575880a90d32dc6d37b4947e73d1d1c5 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Sat, 14 Dec 2019 13:15:47 +0100 Subject: [PATCH 20/24] Fix: /etc/hosts not used on DNS resolution --- alpine/tmplv2.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine/tmplv2.Dockerfile b/alpine/tmplv2.Dockerfile index 83ff9a9..1a99e83 100644 --- a/alpine/tmplv2.Dockerfile +++ b/alpine/tmplv2.Dockerfile @@ -12,6 +12,7 @@ RUN set -ex; \ tar xzvf /tmp/traefik.tar.gz -C /usr/local/bin traefik; \ rm -f /tmp/traefik.tar.gz; \ chmod +x /usr/local/bin/traefik +RUN [ ! -e /etc/nsswitch.conf ] && echo "hosts: files dns" > /etc/nsswitch.conf COPY entrypoint.sh / EXPOSE 80 ENTRYPOINT ["/entrypoint.sh"] From b8c22390bf7060adfec287e46aa7a82150921c0b Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Mon, 23 Dec 2019 22:13:43 +0100 Subject: [PATCH 21/24] Update scratch/tmplv2.Dockerfile Co-Authored-By: Damien Duportal --- scratch/tmplv2.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/scratch/tmplv2.Dockerfile b/scratch/tmplv2.Dockerfile index d58954c..6d7df65 100644 --- a/scratch/tmplv2.Dockerfile +++ b/scratch/tmplv2.Dockerfile @@ -2,7 +2,6 @@ FROM scratch COPY --from=traefik:${VERSION}-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=traefik:${VERSION}-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:${VERSION}-alpine /usr/local/bin/traefik / - COPY --from=traefik:v2.1.0-alpine /etc/nsswitch.conf /etc/nsswitch.conf EXPOSE 80 From 3fb98f9b5cc30ed15ed76ae47fb908d2dd359934 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Mon, 23 Dec 2019 22:13:49 +0100 Subject: [PATCH 22/24] Update scratch/tmplv2.Dockerfile Co-Authored-By: Damien Duportal --- scratch/tmplv2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scratch/tmplv2.Dockerfile b/scratch/tmplv2.Dockerfile index 6d7df65..29feb40 100644 --- a/scratch/tmplv2.Dockerfile +++ b/scratch/tmplv2.Dockerfile @@ -2,7 +2,7 @@ FROM scratch COPY --from=traefik:${VERSION}-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=traefik:${VERSION}-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:${VERSION}-alpine /usr/local/bin/traefik / -COPY --from=traefik:v2.1.0-alpine /etc/nsswitch.conf /etc/nsswitch.conf +COPY --from=traefik:${VERSION}-alpine /etc/nsswitch.conf /etc/nsswitch.conf EXPOSE 80 VOLUME ["/tmp"] From dad41a492eb495f8176976f885f3a2233969dccc Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Mon, 23 Dec 2019 22:13:56 +0100 Subject: [PATCH 23/24] Update scratch/tmplv1.Dockerfile Co-Authored-By: Damien Duportal --- scratch/tmplv1.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/scratch/tmplv1.Dockerfile b/scratch/tmplv1.Dockerfile index d58954c..6d7df65 100644 --- a/scratch/tmplv1.Dockerfile +++ b/scratch/tmplv1.Dockerfile @@ -2,7 +2,6 @@ FROM scratch COPY --from=traefik:${VERSION}-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=traefik:${VERSION}-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:${VERSION}-alpine /usr/local/bin/traefik / - COPY --from=traefik:v2.1.0-alpine /etc/nsswitch.conf /etc/nsswitch.conf EXPOSE 80 From 4a31436813c78d82c902853ae25dcba8d5604139 Mon Sep 17 00:00:00 2001 From: Dimitri KOPRIWA Date: Mon, 23 Dec 2019 22:14:02 +0100 Subject: [PATCH 24/24] Update scratch/tmplv1.Dockerfile Co-Authored-By: Damien Duportal --- scratch/tmplv1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scratch/tmplv1.Dockerfile b/scratch/tmplv1.Dockerfile index 6d7df65..29feb40 100644 --- a/scratch/tmplv1.Dockerfile +++ b/scratch/tmplv1.Dockerfile @@ -2,7 +2,7 @@ FROM scratch COPY --from=traefik:${VERSION}-alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=traefik:${VERSION}-alpine /usr/share/zoneinfo /usr/share/ COPY --from=traefik:${VERSION}-alpine /usr/local/bin/traefik / -COPY --from=traefik:v2.1.0-alpine /etc/nsswitch.conf /etc/nsswitch.conf +COPY --from=traefik:${VERSION}-alpine /etc/nsswitch.conf /etc/nsswitch.conf EXPOSE 80 VOLUME ["/tmp"]