From 5a07601be1bcc8293463469cf2952ad36fefe280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BA=91?= Date: Tue, 10 May 2022 21:52:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(7.4-caddy):=20=E2=9C=A8=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=B3=BB=E7=BB=9F=EF=BC=8C=E4=BC=98=E5=8C=96=E5=88=86?= =?UTF-8?q?=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- caddy/7.4/Dockerfile | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/caddy/7.4/Dockerfile b/caddy/7.4/Dockerfile index d7aabc1..00fff65 100644 --- a/caddy/7.4/Dockerfile +++ b/caddy/7.4/Dockerfile @@ -7,38 +7,34 @@ LABEL version="7.4" \ WORKDIR /srv -# 系统设置(设置时区) -RUN rm -rf /etc/localtime \ - && ln -s /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ - && echo "Asia/Shanghai" /etc/timezone - # 添加 Composer COPY --from=composer /usr/bin/composer /usr/bin/composer -# 国内源 -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories - # 添加 Caddy COPY --from=base /usr/bin/caddy /usr/bin/caddy COPY caddy/Caddyfile /etc/caddy/ COPY --from=base /usr/share/caddy /usr/share/caddy COPY --from=base /etc/nsswitch.conf /etc/nsswitch.conf - -RUN apk add --no-cache ca-certificates mailcap \ - && set -eux \ - && mkdir -p \ - /config/caddy \ - /data/caddy \ - /etc/caddy \ - /usr/share/caddy +ADD caddy/startup . # See https://caddyserver.com/docs/conventions#file-locations for details ENV XDG_CONFIG_HOME /config ENV XDG_DATA_HOME /data + +# 系统设置(设置时区) +# 国内源 && 系统更新 +RUN rm -rf /etc/localtime \ + && ln -s /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ + && echo "Asia/Shanghai" /etc/timezone \ + && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \ + && apk update \ + && apk upgrade \ + && apk add --no-cache ca-certificates mailcap \ + && chmod +x ./startup && pwd && ls -la + EXPOSE 80 # 入口 -ADD caddy/startup . -RUN chmod +x ./startup && pwd && ls -la +RUN ENTRYPOINT ./startup \ No newline at end of file