From 09d33a4d07c1b020ac708e2d1198e5d6dbe2bddc 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:33:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(7.4-caddy):=20=E2=9C=A8=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86composer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- caddy/7.4/Dockerfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/caddy/7.4/Dockerfile b/caddy/7.4/Dockerfile index d6ac8a5..d7aabc1 100644 --- a/caddy/7.4/Dockerfile +++ b/caddy/7.4/Dockerfile @@ -12,9 +12,18 @@ 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 \ @@ -23,13 +32,6 @@ RUN apk add --no-cache ca-certificates mailcap \ /etc/caddy \ /usr/share/caddy -# 添加 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 - - # See https://caddyserver.com/docs/conventions#file-locations for details ENV XDG_CONFIG_HOME /config ENV XDG_DATA_HOME /data