Fix docker-compose for Coolify YAML re-parse rules.
Single-line if/fi in create-site, quoted env list form, and MariaDB healthcheck defaults per coolify-docker-compose skill.
This commit is contained in:
parent
26933f3e66
commit
cacbce384f
1 changed files with 2 additions and 8 deletions
|
|
@ -33,7 +33,7 @@ services:
|
||||||
- 'MARIADB_AUTO_UPGRADE=1'
|
- 'MARIADB_AUTO_UPGRADE=1'
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
|
test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
|
||||||
start_period: 10s
|
start_period: 5s
|
||||||
interval: 5s
|
interval: 5s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 10
|
retries: 10
|
||||||
|
|
@ -102,13 +102,7 @@ services:
|
||||||
wait-for-it -t 120 db:3306;
|
wait-for-it -t 120 db:3306;
|
||||||
wait-for-it -t 120 redis-cache:6379;
|
wait-for-it -t 120 redis-cache:6379;
|
||||||
wait-for-it -t 120 redis-queue:6379;
|
wait-for-it -t 120 redis-queue:6379;
|
||||||
if [ -d "sites/$$SITE" ]; then echo "[create-site] exists"; $$B use "$$SITE"; else
|
if [ -d "sites/$$SITE" ]; then echo "[create-site] exists"; $$B use "$$SITE"; else echo "[create-site] creating"; INSTALL_ARGS=""; IFS=',' read -r -a apps <<< "$$INSTALL_APPS"; for app in "$${apps[@]}"; do INSTALL_ARGS="$$INSTALL_ARGS --install-app $$app"; done; $$B new-site "$$SITE" --mariadb-user-host-login-scope='%' --admin-password "$$ADMIN_PASSWORD" --db-root-password "$$DB_PASSWORD" $$INSTALL_ARGS --set-default; fi
|
||||||
echo "[create-site] creating";
|
|
||||||
INSTALL_ARGS="";
|
|
||||||
IFS=',' read -r -a apps <<< "$$INSTALL_APPS";
|
|
||||||
for app in "$${apps[@]}"; do INSTALL_ARGS="$$INSTALL_ARGS --install-app $$app"; done;
|
|
||||||
$$B new-site "$$SITE" --mariadb-user-host-login-scope='%' --admin-password "$$ADMIN_PASSWORD" --db-root-password "$$DB_PASSWORD" $$INSTALL_ARGS --set-default;
|
|
||||||
fi
|
|
||||||
environment:
|
environment:
|
||||||
- 'SITE_NAME=${SITE_NAME:-erp.example.com}'
|
- 'SITE_NAME=${SITE_NAME:-erp.example.com}'
|
||||||
- 'ADMIN_PASSWORD=${ADMIN_PASSWORD:-changeme}'
|
- 'ADMIN_PASSWORD=${ADMIN_PASSWORD:-changeme}'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue