Merge pull request 'fix: infra: deprecate tracked docker/Caddyfile — generate_caddyfile is the single source of truth (#771)' (#785) from fix/issue-771 into main
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
This commit is contained in:
commit
49cc870f54
2 changed files with 8 additions and 1 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -33,6 +33,9 @@ docker/agents/bin/
|
|||
# Note: This file is now committed to track volume mount configuration
|
||||
# docker-compose.yml
|
||||
|
||||
# Generated Caddyfile — single source of truth is generate_caddyfile in lib/generators.sh
|
||||
docker/Caddyfile
|
||||
|
||||
# Python bytecode
|
||||
__pycache__/
|
||||
*.pyc
|
||||
|
|
|
|||
|
|
@ -652,7 +652,11 @@ _generate_agent_docker_impl() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Generate docker/Caddyfile template for edge proxy.
|
||||
# Generate docker/Caddyfile for the edge proxy.
|
||||
# **CANONICAL SOURCE**: This generator is the single source of truth for the Caddyfile.
|
||||
# Output path: ${FACTORY_ROOT}/docker/Caddyfile (gitignored — generated artifact).
|
||||
# The edge compose service mounts this path as /etc/caddy/Caddyfile.
|
||||
# On a fresh clone, `disinto init` calls generate_caddyfile before first `disinto up`.
|
||||
_generate_caddyfile_impl() {
|
||||
local docker_dir="${FACTORY_ROOT}/docker"
|
||||
local caddyfile="${docker_dir}/Caddyfile"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue