From ed8ee1971f51c42080b3d5e4e2607155b487dc45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BA=91?= <dongyun.li@luxcreo.ai>
Date: Tue, 10 May 2022 20:54:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9E=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE=E9=80=A0=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 caddy/7.4/Dockerfile      | 4 ++--
 caddy/{7.4 => }/Caddyfile | 0
 caddy/{7.4 => }/startup   | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename caddy/{7.4 => }/Caddyfile (100%)
 rename caddy/{7.4 => }/startup (100%)

diff --git a/caddy/7.4/Dockerfile b/caddy/7.4/Dockerfile
index 09bb217..75fa797 100644
--- a/caddy/7.4/Dockerfile
+++ b/caddy/7.4/Dockerfile
@@ -23,7 +23,7 @@ RUN apk add --no-cache ca-certificates mailcap \
 
 # 添加 Caddy
 COPY --from=base /usr/bin/caddy /usr/bin/caddy
-COPY caddy/7.4/Caddyfile /etc/caddy/
+COPY caddy/Caddyfile /etc/caddy/
 COPY --from=base /usr/share/caddy /usr/share/caddy
 COPY --from=base /etc/nsswitch.conf /etc/nsswitch.conf
 
@@ -35,5 +35,5 @@ ENV XDG_DATA_HOME /data
 EXPOSE 80
 
 # 入口
-COPY startup .
+COPY caddy/startup .
 ENTRYPOINT ./startup
\ No newline at end of file
diff --git a/caddy/7.4/Caddyfile b/caddy/Caddyfile
similarity index 100%
rename from caddy/7.4/Caddyfile
rename to caddy/Caddyfile
diff --git a/caddy/7.4/startup b/caddy/startup
similarity index 100%
rename from caddy/7.4/startup
rename to caddy/startup