fix(docker): fix Caddy crash when VDS_DOMAIN is empty

Generate Caddyfile from template in entrypoint, avoid empty email/site placeholders, and use curl.exe on Windows for health checks.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: codeboyzhou

frontend/Caddyfile frontend/Caddyfile.templatefrontend/Caddyfile renamed to frontend/Caddyfile.template

@@ -1,12 +1,7 @@
-# VDS_DOMAIN — public hostname (e.g. vds.example.com). Leave empty for local HTTP on :80.
-# ACME_EMAIL — optional; Let's Encrypt expiry notices when VDS_DOMAIN is set.
-# Certificates persist in the caddy-data volume (/data).
+# Generated at container start from VDS_DOMAIN (see docker-entrypoint.sh).
+# @SITE@ is :80 for local HTTP, or your public hostname for automatic HTTPS.
 
-{
-	email {$ACME_EMAIL}
-}
-
-{$VDS_DOMAIN::80} {
+@SITE@ {
 	root * /srv
 	encode gzip zstd
 

frontend/Dockerfile

@@ -9,6 +9,12 @@ COPY . .
 RUN npm run build
 
 FROM ${CADDY_IMAGE}
+RUN apk add --no-cache curl
 COPY --from=build /app/dist /srv
-COPY Caddyfile /etc/caddy/Caddyfile
+COPY Caddyfile.template /etc/caddy/Caddyfile.template
+COPY email.caddy /etc/caddy/email.caddy
+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+RUN sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh \
+    && chmod +x /usr/local/bin/docker-entrypoint.sh
 EXPOSE 80 443 443/udp
+ENTRYPOINT ["docker-entrypoint.sh"]

frontend/docker-entrypoint.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+if [ -z "${VDS_DOMAIN:-}" ]; then
+  SITE=":80"
+else
+  SITE="$VDS_DOMAIN"
+fi
+
+sed "s|@SITE@|${SITE}|g" /etc/caddy/Caddyfile.template > /etc/caddy/Caddyfile
+
+if [ -n "${ACME_EMAIL:-}" ]; then
+  exec caddy run \
+    --config /etc/caddy/email.caddy \
+    --config /etc/caddy/Caddyfile \
+    --adapter caddyfile
+fi
+
+exec caddy run --config /etc/caddy/Caddyfile --adapter caddyfile

frontend/email.caddy

@@ -0,0 +1,3 @@
+{
+	email {$ACME_EMAIL}
+}

scripts/run-in-docker.cmd

@@ -40,7 +40,7 @@ echo Waiting for %URL% ...
 
 set /a ATTEMPTS=90
 :waitLoop
-curl -fsS -o nul -m 3 "%URL%" 2>nul
+curl.exe -fsS -o nul -m 3 "%URL%" 2>nul
 if not errorlevel 1 goto ready
 set /a ATTEMPTS-=1
 if %ATTEMPTS% LEQ 0 goto timeout
@@ -53,5 +53,7 @@ if "%NO_OPEN%"=="0" start "" "%URL%"
 exit /b 0
 
 :timeout
-echo Timed out waiting for the UI. Check: docker compose logs -f >&2
+echo Timed out waiting for the UI at %URL%. >&2
+docker compose ps >&2
+docker compose logs frontend --tail 15 >&2
 exit /b 1

scripts/run-in-docker.sh

@@ -50,10 +50,10 @@ done
 
 if [[ "$ready" -ne 1 ]]; then
   echo "Timed out waiting for the UI at ${URL}." >&2
+  docker compose ps >&2 || true
+  docker compose logs frontend --tail 15 >&2 || true
   if [[ "$URL" == https://* ]]; then
-    echo "For HTTPS: confirm VDS_DOMAIN DNS, ports 80/443 open, and: docker compose logs -f frontend" >&2
-  else
-    echo "Check: docker compose logs -f" >&2
+    echo "For HTTPS: confirm VDS_DOMAIN DNS and ports 80/443 open." >&2
   fi
   exit 1
 fi