diff --git a/docker-compose.yml b/docker-compose.yml index ea43dad..4cc4cab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,7 @@ services: - 'MARIADB_AUTO_UPGRADE=1' healthcheck: test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized'] - start_period: 10s + start_period: 5s interval: 5s timeout: 5s retries: 10 @@ -102,13 +102,7 @@ services: wait-for-it -t 120 db:3306; wait-for-it -t 120 redis-cache:6379; wait-for-it -t 120 redis-queue:6379; - 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 + 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 environment: - 'SITE_NAME=${SITE_NAME:-erp.example.com}' - 'ADMIN_PASSWORD=${ADMIN_PASSWORD:-changeme}'