fix(upgrade): preserve compose override expansion
This commit is contained in:
parent
33f3a0b100
commit
2833c68af9
2 changed files with 4 additions and 4 deletions
|
|
@ -248,11 +248,11 @@ nohup bash -c "
|
||||||
COMPOSE_FILES='-f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml'
|
COMPOSE_FILES='-f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml'
|
||||||
if [ -f /data/coolify/source/docker-compose.custom.yml ]; then
|
if [ -f /data/coolify/source/docker-compose.custom.yml ]; then
|
||||||
log 'Using custom docker-compose.yml'
|
log 'Using custom docker-compose.yml'
|
||||||
COMPOSE_FILES="\$COMPOSE_FILES -f /data/coolify/source/docker-compose.custom.yml"
|
COMPOSE_FILES=\"\$COMPOSE_FILES -f /data/coolify/source/docker-compose.custom.yml\"
|
||||||
fi
|
fi
|
||||||
if [ -f /data/coolify/source/docker-compose.postgres-upgrade.yml ]; then
|
if [ -f /data/coolify/source/docker-compose.postgres-upgrade.yml ]; then
|
||||||
log 'Using PostgreSQL upgrade compose override'
|
log 'Using PostgreSQL upgrade compose override'
|
||||||
COMPOSE_FILES="\$COMPOSE_FILES -f /data/coolify/source/docker-compose.postgres-upgrade.yml"
|
COMPOSE_FILES=\"\$COMPOSE_FILES -f /data/coolify/source/docker-compose.postgres-upgrade.yml\"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
log 'Running docker compose up...'
|
log 'Running docker compose up...'
|
||||||
|
|
|
||||||
|
|
@ -257,11 +257,11 @@ nohup bash -c "
|
||||||
COMPOSE_FILES='-f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml'
|
COMPOSE_FILES='-f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml'
|
||||||
if [ -f /data/coolify/source/docker-compose.custom.yml ]; then
|
if [ -f /data/coolify/source/docker-compose.custom.yml ]; then
|
||||||
log 'Using custom docker-compose.yml'
|
log 'Using custom docker-compose.yml'
|
||||||
COMPOSE_FILES="\$COMPOSE_FILES -f /data/coolify/source/docker-compose.custom.yml"
|
COMPOSE_FILES=\"\$COMPOSE_FILES -f /data/coolify/source/docker-compose.custom.yml\"
|
||||||
fi
|
fi
|
||||||
if [ -f /data/coolify/source/docker-compose.postgres-upgrade.yml ]; then
|
if [ -f /data/coolify/source/docker-compose.postgres-upgrade.yml ]; then
|
||||||
log 'Using PostgreSQL upgrade compose override'
|
log 'Using PostgreSQL upgrade compose override'
|
||||||
COMPOSE_FILES="\$COMPOSE_FILES -f /data/coolify/source/docker-compose.postgres-upgrade.yml"
|
COMPOSE_FILES=\"\$COMPOSE_FILES -f /data/coolify/source/docker-compose.postgres-upgrade.yml\"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
log 'Running docker compose up...'
|
log 'Running docker compose up...'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue