github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: align caddy route container's site declarator with web's

Browse Source 
The non-web container's caddy=DOMAIN label and web's caddy=DOMAIN:80 label declare separate Caddyfile site blocks, so caddy-docker-proxy never merges the route's handle directive into the site that actually serves port 80. fn-caddy-route-labels now mirrors web's letsencrypt + 443 check and emits DOMAIN:80 in the HTTP-only path. The bats T1 also dumps the web container's labels alongside api's so future declarator mismatches are visible in CI logs.
This commit is contained in:
Jose Diaz-Gonzalez
2026-06-03 19:18:39 -04:00
parent dfd6e434a4
commit 1c6b16e823
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/caddy-vhosts/internal-functions
View File

@@ -18,10 +18,27 @@ fn-caddy-route-labels() {
output=""
if [[ -n "$caddy_domains" ]]; then
# Joining the same site declared by the web container so this container's
# handler directives are merged into the existing site block by
# caddy-docker-proxy.
output="--label 'caddy=${caddy_domains}'"
# Mirror web's site-declarator computation in docker-args-process-deploy so
# both containers join the same Caddyfile site block. caddy treats DOMAIN
# and DOMAIN:80 as separate sites - if web declares DOMAIN:80 and we
# declare DOMAIN, caddy-docker-proxy renders two unrelated site blocks
# and the route's handle never sees port-80 traffic.
local letsencrypt_email port_map scheme host_port
local has_443_mapping=false
letsencrypt_email="$(fn-caddy-computed-letsencrypt-email)"
while read -r port_map; do
scheme="$(awk -F ':' '{ print $1 }' <<<"$port_map")"
host_port="$(awk -F ':' '{ print $2 }' <<<"$port_map")"
if [[ "$scheme" == "https" ]] || [[ "$host_port" == "443" ]]; then
has_443_mapping=true
fi
done < <(plugn trigger ports-get "$APP")
if [[ -n "$letsencrypt_email" ]] && [[ "$has_443_mapping" == "true" ]]; then
output="--label 'caddy=${caddy_domains}'"
else
output="--label 'caddy=${caddy_domains//, /:80, }:80'"
fi
fi
while IFS='|' read -r route_proc route_port route_path route_strip; do

7
tests/unit/proxy-route-caddy.bats
View File

@@ -42,6 +42,13 @@ teardown() {
run /bin/bash -c "docker inspect ${TEST_APP}.api.1 --format '{{json .Config.Labels}}' 2>&1 | jq . 2>/dev/null || docker inspect ${TEST_APP}.api.1 --format '{{json .Config.Labels}}' 2>&1"
echo "api labels: $output"
# Also dump the web container's labels so we can compare site declarators
# between web and api - caddy treats DOMAIN and DOMAIN:80 as separate
# sites, and a mismatch keeps caddy-docker-proxy from merging the two
# containers' directives into a single site block.
run /bin/bash -c "docker inspect ${TEST_APP}.web.1 --format '{{json .Config.Labels}}' 2>&1 | jq . 2>/dev/null || docker inspect ${TEST_APP}.web.1 --format '{{json .Config.Labels}}' 2>&1"
echo "web labels: $output"
# Give the daemon a moment to read the new labels.
sleep 5