From 07871bbde94a829a75a7a511fd9a61937d51020f Mon Sep 17 00:00:00 2001 From: denis0001-dev Date: Wed, 1 Apr 2026 14:22:21 +0300 Subject: [PATCH] Add additions support --- deployment/caddy/Dockerfile | 21 ++++++++++++++++++++- deployment/caddy/additions/.gitignore | 2 ++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 deployment/caddy/additions/.gitignore diff --git a/deployment/caddy/Dockerfile b/deployment/caddy/Dockerfile index a21acd3..0aab7e0 100644 --- a/deployment/caddy/Dockerfile +++ b/deployment/caddy/Dockerfile @@ -10,4 +10,23 @@ RUN xcaddy build \ FROM caddy:2 COPY --from=builder /usr/bin/caddy /usr/bin/caddy -COPY Caddyfile /etc/caddy/Caddyfile \ No newline at end of file +COPY Caddyfile /etc/caddy/Caddyfile +COPY additions /etc/caddy/additions + +# Merge base Caddyfile + additional snippets (if present), +# in alphabetical order, and remove additions from final image. +RUN sh -c 'set -eu; \ + if [ -d /etc/caddy/additions ]; then \ + tmp="$(mktemp)"; \ + cat /etc/caddy/Caddyfile > "$tmp"; \ + for f in $(printf "%s\n" /etc/caddy/additions/* 2>/dev/null | sort); do \ + [ -f "$f" ] || continue; \ + base="$(basename "$f")"; \ + [ "$base" = ".gitkeep" ] && continue; \ + [ "$base" = ".gitignore" ] && continue; \ + printf "\n\n" >> "$tmp"; \ + cat "$f" >> "$tmp"; \ + done; \ + mv "$tmp" /etc/caddy/Caddyfile; \ + rm -rf /etc/caddy/additions; \ + fi' \ No newline at end of file diff --git a/deployment/caddy/additions/.gitignore b/deployment/caddy/additions/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/deployment/caddy/additions/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore