Improve caddy image
Some checks failed
build/mx-puppet-steam Building image mx-puppet-steam
build/base Building image base
build/frp Building image frp
build/node-script Building image node-script
build/fluentd Building image fluentd
build/forgejo Building image forgejo
build/python-script Building image python-script
build/fava Building image fava
build/caddy Building image caddy
build/gotenberg Building image gotenberg
build/nextcloud Building image nextcloud
build/lua-clib Building image lua-clib
build/ruby-script Building image ruby-script
build/gitea Building images gitea-package, gitea-pr, gitea-status
build/rust-xwin Building image rust-xwin
Some checks failed
build/mx-puppet-steam Building image mx-puppet-steam
build/base Building image base
build/frp Building image frp
build/node-script Building image node-script
build/fluentd Building image fluentd
build/forgejo Building image forgejo
build/python-script Building image python-script
build/fava Building image fava
build/caddy Building image caddy
build/gotenberg Building image gotenberg
build/nextcloud Building image nextcloud
build/lua-clib Building image lua-clib
build/ruby-script Building image ruby-script
build/gitea Building images gitea-package, gitea-pr, gitea-status
build/rust-xwin Building image rust-xwin
This commit is contained in:
parent
085c10a79b
commit
3c51d83004
2 changed files with 16 additions and 1 deletions
|
@ -5,6 +5,9 @@ RUN xcaddy build --with github.com/WeidiDeng/caddy-cloudflare-ip
|
||||||
FROM caddy:2.9.1
|
FROM caddy:2.9.1
|
||||||
|
|
||||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||||
|
COPY ./entrypoint.sh /entrypoint.sh
|
||||||
|
|
||||||
|
ENV CADDYFILE=/etc/caddy/Caddyfile
|
||||||
|
|
||||||
VOLUME /etc/caddy
|
VOLUME /etc/caddy
|
||||||
CMD ["/usr/bin/caddy", "--config", "/etc/caddy/Caddyfile"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
|
|
12
images/caddy/entrypoint.sh
Executable file
12
images/caddy/entrypoint.sh
Executable file
|
@ -0,0 +1,12 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
CADDYFILE="${CADDYFILE:-/etc/caddy/Caddyfile}"
|
||||||
|
/usr/bin/caddy validate --config "$CADDYFILE"
|
||||||
|
|
||||||
|
if [ -n "$1" ]; then
|
||||||
|
exec /usr/bin/caddy "$@"
|
||||||
|
else
|
||||||
|
exec /usr/bin/caddy --config "$CADDYFILE"
|
||||||
|
fi
|
Loading…
Add table
Reference in a new issue