From 72513bfedb67b129ef8360282a54379595383cbe Mon Sep 17 00:00:00 2001 From: Teddysun Date: Thu, 12 Nov 2020 16:32:39 +0900 Subject: [PATCH] Update Dockerfile --- docker/caddy/Dockerfile | 8 ++------ docker/caddy/Dockerfile.architecture | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/docker/caddy/Dockerfile b/docker/caddy/Dockerfile index 8c5c6c0..a950524 100644 --- a/docker/caddy/Dockerfile +++ b/docker/caddy/Dockerfile @@ -27,16 +27,12 @@ COPY index.html /usr/share/caddy/index.html # See https://caddyserver.com/docs/conventions#file-locations for details ENV XDG_CONFIG_HOME /config ENV XDG_DATA_HOME /data -# Let's Encrypt Agreement -ENV ACME_AGREE="false" VOLUME /etc/caddy VOLUME /config VOLUME /data -EXPOSE 80 -EXPOSE 443 -EXPOSE 2015 +EXPOSE 80 443 2015 ENV TZ=Asia/Shanghai -CMD [ "/usr/bin/caddy", "--conf", "/etc/caddy/Caddyfile", "--agree=$ACME_AGREE" ] +CMD [ "/usr/bin/caddy", "-conf", "/etc/caddy/Caddyfile", "-agree" ] diff --git a/docker/caddy/Dockerfile.architecture b/docker/caddy/Dockerfile.architecture index 132053e..5b5af3f 100644 --- a/docker/caddy/Dockerfile.architecture +++ b/docker/caddy/Dockerfile.architecture @@ -28,16 +28,12 @@ COPY index.html /usr/share/caddy/index.html # See https://caddyserver.com/docs/conventions#file-locations for details ENV XDG_CONFIG_HOME /config ENV XDG_DATA_HOME /data -# Let's Encrypt Agreement -ENV ACME_AGREE="false" VOLUME /etc/caddy VOLUME /config VOLUME /data -EXPOSE 80 -EXPOSE 443 -EXPOSE 2015 +EXPOSE 80 443 2015 ENV TZ=Asia/Shanghai -CMD [ "/usr/bin/caddy", "--conf", "/etc/caddy/Caddyfile", "--agree=$ACME_AGREE" ] +CMD [ "/usr/bin/caddy", "-conf", "/etc/caddy/Caddyfile", "-agree" ]