Merge pull request #2185 from pikasTech/fix/caddy-validate-command

fix: 调用 Caddy 校验二进制
2026-07-15 18:02:51 +08:00
parent dd8c18a311 d03af4f53c
commit 4817b5fc69
1 changed files with 1 additions and 1 deletions
@@ -245,7 +245,7 @@ if [ "$vpn_rc" -eq 0 ]; then
    old_caddyfile=false
  fi
  printf '%s' '${caddyfile}' | base64 -d >${shQuote(spec.caddy.caddyfilePath)}
-  docker run --rm -v ${shQuote(`${spec.caddy.caddyfilePath}:/etc/caddy/Caddyfile:ro`)} ${shQuote(spec.caddy.image)} validate --config /etc/caddy/Caddyfile --adapter caddyfile >"$tmp/caddy-validate.out" 2>"$tmp/caddy-validate.err"
+  docker run --rm -v ${shQuote(`${spec.caddy.caddyfilePath}:/etc/caddy/Caddyfile:ro`)} ${shQuote(spec.caddy.image)} caddy validate --config /etc/caddy/Caddyfile --adapter caddyfile >"$tmp/caddy-validate.out" 2>"$tmp/caddy-validate.err"
  validate_rc=$?
  if [ "$validate_rc" -eq 0 ]; then
    docker compose -f ${shQuote(spec.caddy.composePath)} up -d >"$tmp/caddy.out" 2>"$tmp/caddy.err"