From aafe3d5d03cc3c86f99faae128cd31a3b9570cc3 Mon Sep 17 00:00:00 2001 From: Teddysun Date: Sun, 20 Sep 2020 14:22:42 +0900 Subject: [PATCH] Update Dockerfile --- docker/caddy/Dockerfile | 3 ++- docker/caddy/Dockerfile.architecture | 3 ++- docker/caddy/caddy.sh | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/caddy/Dockerfile b/docker/caddy/Dockerfile index cb640cb..48912d9 100644 --- a/docker/caddy/Dockerfile +++ b/docker/caddy/Dockerfile @@ -14,7 +14,8 @@ RUN set -ex \ && apk add --no-cache tzdata ca-certificates mailcap \ && chmod +x /root/caddy.sh \ && /root/caddy.sh \ - && rm -fv /root/caddy.sh + && rm -fv /root/caddy.sh \ + && caddy version # set up nsswitch.conf for Go's "netgo" implementation # see: https://github.com/docker-library/golang/blob/1eb096131592bcbc90aa3b97471811c798a93573/1.14/alpine3.12/Dockerfile#L9 diff --git a/docker/caddy/Dockerfile.architecture b/docker/caddy/Dockerfile.architecture index c0683ce..7729cd5 100644 --- a/docker/caddy/Dockerfile.architecture +++ b/docker/caddy/Dockerfile.architecture @@ -15,7 +15,8 @@ RUN set -ex \ && apk add --no-cache tzdata ca-certificates mailcap \ && chmod +x /root/caddy.sh \ && /root/caddy.sh "${TARGETPLATFORM}" \ - && rm -fv /root/caddy.sh + && rm -fv /root/caddy.sh \ + && caddy version # set up nsswitch.conf for Go's "netgo" implementation # see: https://github.com/docker-library/golang/blob/1eb096131592bcbc90aa3b97471811c798a93573/1.14/alpine3.12/Dockerfile#L9 diff --git a/docker/caddy/caddy.sh b/docker/caddy/caddy.sh index d7383ca..7df1448 100644 --- a/docker/caddy/caddy.sh +++ b/docker/caddy/caddy.sh @@ -51,4 +51,3 @@ fi echo "Download binary file: ${CADDY_FILE} completed" chmod +x /usr/bin/caddy -/usr/bin/caddy version