From 3c51d8300437eb0f522301a08a45413135dc1cc4 Mon Sep 17 00:00:00 2001
From: Lucas Schwiderski <lucas@lschwiderski.de>
Date: Wed, 26 Feb 2025 14:09:57 +0100
Subject: [PATCH] Improve caddy image

---
 images/caddy/Dockerfile    |  5 ++++-
 images/caddy/entrypoint.sh | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100755 images/caddy/entrypoint.sh

diff --git a/images/caddy/Dockerfile b/images/caddy/Dockerfile
index 67ebb70..cbfba63 100644
--- a/images/caddy/Dockerfile
+++ b/images/caddy/Dockerfile
@@ -5,6 +5,9 @@ RUN xcaddy build --with github.com/WeidiDeng/caddy-cloudflare-ip
 FROM caddy:2.9.1
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+COPY ./entrypoint.sh /entrypoint.sh
+
+ENV CADDYFILE=/etc/caddy/Caddyfile
 
 VOLUME /etc/caddy
-CMD ["/usr/bin/caddy", "--config", "/etc/caddy/Caddyfile"]
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/images/caddy/entrypoint.sh b/images/caddy/entrypoint.sh
new file mode 100755
index 0000000..f218b52
--- /dev/null
+++ b/images/caddy/entrypoint.sh
@@ -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