fix: escape \$(...) as \$\$(...) in patroni command blocks — Compose interpolation was choking on \$( before the shell ever saw it (invalid interpolation format error)
ci/woodpecker/push/deploy Pipeline was successful
ci/woodpecker/push/deploy Pipeline was successful
This commit is contained in:
@@ -12,6 +12,11 @@
|
|||||||
#
|
#
|
||||||
# Deploy: docker stack deploy -c <this file> pgha-test
|
# Deploy: docker stack deploy -c <this file> pgha-test
|
||||||
# Teardown: docker stack rm pgha-test && rm -rf /volume1/docker/PostgreSQL/dryrun
|
# Teardown: docker stack rm pgha-test && rm -rf /volume1/docker/PostgreSQL/dryrun
|
||||||
|
#
|
||||||
|
# NOTE: command: blocks use $$(...) not $(...) — Compose's own variable
|
||||||
|
# interpolation parses $( as an attempted ${VAR} reference and fails with
|
||||||
|
# "invalid interpolation format" / "you may need to escape any $ with
|
||||||
|
# another $". $$ escapes to a literal $ for the shell at runtime.
|
||||||
# ─────────────────────────────────────────────────────────────────────────
|
# ─────────────────────────────────────────────────────────────────────────
|
||||||
version: "3.6"
|
version: "3.6"
|
||||||
|
|
||||||
@@ -115,10 +120,10 @@ services:
|
|||||||
- /bin/sh
|
- /bin/sh
|
||||||
- -c
|
- -c
|
||||||
- |
|
- |
|
||||||
export PGPASSWORD_SUPERUSER="$(cat /run/secrets/postgresql_password)"
|
export PGPASSWORD_SUPERUSER="$$(cat /run/secrets/postgresql_password)"
|
||||||
export PGPASSWORD_STANDBY="$(cat /run/secrets/postgresql_replication_password)"
|
export PGPASSWORD_STANDBY="$$(cat /run/secrets/postgresql_replication_password)"
|
||||||
export PATRONI_RESTAPI_PASSWORD="$(cat /run/secrets/postgresql_patroni_password)"
|
export PATRONI_RESTAPI_PASSWORD="$$(cat /run/secrets/postgresql_patroni_password)"
|
||||||
export CLONE_PASSWORD="$(cat /run/secrets/postgresql_password)"
|
export CLONE_PASSWORD="$$(cat /run/secrets/postgresql_password)"
|
||||||
exec /bin/sh /launch.sh init
|
exec /bin/sh /launch.sh init
|
||||||
environment:
|
environment:
|
||||||
SCOPE: pgha-test
|
SCOPE: pgha-test
|
||||||
@@ -153,10 +158,10 @@ services:
|
|||||||
- /bin/sh
|
- /bin/sh
|
||||||
- -c
|
- -c
|
||||||
- |
|
- |
|
||||||
export PGPASSWORD_SUPERUSER="$(cat /run/secrets/postgresql_password)"
|
export PGPASSWORD_SUPERUSER="$$(cat /run/secrets/postgresql_password)"
|
||||||
export PGPASSWORD_STANDBY="$(cat /run/secrets/postgresql_replication_password)"
|
export PGPASSWORD_STANDBY="$$(cat /run/secrets/postgresql_replication_password)"
|
||||||
export PATRONI_RESTAPI_PASSWORD="$(cat /run/secrets/postgresql_patroni_password)"
|
export PATRONI_RESTAPI_PASSWORD="$$(cat /run/secrets/postgresql_patroni_password)"
|
||||||
export CLONE_PASSWORD="$(cat /run/secrets/postgresql_password)"
|
export CLONE_PASSWORD="$$(cat /run/secrets/postgresql_password)"
|
||||||
exec /bin/sh /launch.sh init
|
exec /bin/sh /launch.sh init
|
||||||
environment:
|
environment:
|
||||||
SCOPE: pgha-test
|
SCOPE: pgha-test
|
||||||
|
|||||||
Reference in New Issue
Block a user