forked from admin/ansible
fix(compose): drop shell default syntax from EXTRA_ENDPOINTS
brencher parses compose via re.sub(r'\$\{([^}]+)\}', lambda m: env[m.group(1)]).
With shell default syntax ${VAR:-default} the regex captures 'VAR:-default'
as a single key, env['VAR:-default'] raises KeyError.
Use bare ${EXTRA_ENDPOINTS}; if the env var is missing brencher's
.env lookup (or the dict.get fallback in the deploy step) handles it.
If EXTRA_ENDPOINTS isn't set at deploy time the value is empty, which
the python service treats as 'no extras'.
This commit is contained in:
@@ -14,7 +14,7 @@ services:
|
||||
environment:
|
||||
PERIOD_SECONDS: "600"
|
||||
CHECK_TIMEOUT_S: "3"
|
||||
EXTRA_ENDPOINTS: "${EXTRA_ENDPOINTS:-}"
|
||||
EXTRA_ENDPOINTS: "${EXTRA_ENDPOINTS}"
|
||||
HTTP_PROXY: "http://squid:3128"
|
||||
HTTPS_PROXY: "http://squid:3128"
|
||||
NO_PROXY: "localhost,127.0.0.1,.local,squid,hermes-gateway,hermes-agent,hermes-proxy,brencher-state-proxy,docker_socket_proxy,10.0.0.0/8"
|
||||
|
||||
Reference in New Issue
Block a user