diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2024-10-24 11:34:50 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2024-10-24 11:35:05 +0300 |
| commit | 68da94cc366e2f61191af645e210c572ce1d6c98 (patch) | |
| tree | 727ce80595ef6edde7022b734e8b71492907825b /.docker | |
| parent | dba6a39d2a34b9e2368b5da566ae24f1a10d5e5d (diff) | |
move sql patch file stuff after all initialization tasks
Diffstat (limited to '.docker')
| -rw-r--r-- | .docker/app/Dockerfile | 2 | ||||
| -rw-r--r-- | .docker/app/startup.sh | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index b8bb7598f..8662e322f 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -25,7 +25,7 @@ RUN [ ! -z ${ALPINE_MIRROR} ] && \ -e 's/;\(php_admin_value\[error_log\]\) = .*/\1 = \/tmp\/error.log/' \ -e 's/;\(php_admin_flag\[log_errors\]\) = .*/\1 = on/' \ /etc/php83/php-fpm.d/www.conf && \ - mkdir -p /var/www ${SCRIPT_ROOT}/config.d ${SCRIPT_ROOT}/sql/post-up.d + mkdir -p /var/www ${SCRIPT_ROOT}/config.d ${SCRIPT_ROOT}/sql/post-init.d ARG CI_COMMIT_BRANCH ENV CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH} diff --git a/.docker/app/startup.sh b/.docker/app/startup.sh index 2669310b2..86b10b746 100644 --- a/.docker/app/startup.sh +++ b/.docker/app/startup.sh @@ -114,11 +114,6 @@ sed -i.bak "s/^\(pm.max_children\) = \(.*\)/\1 = ${PHP_WORKER_MAX_CHILDREN}/" \ sudo -Eu app php83 $DST_DIR/update.php --update-schema=force-yes -find ${SCRIPT_ROOT}/sql/post-up.d/ -type f -name '*.sql' | while read F; do - echo applying SQL patch file: $F - $PSQL -f $F -done - if [ ! -z "$ADMIN_USER_PASS" ]; then sudo -Eu app php83 $DST_DIR/update.php --user-set-password "admin:$ADMIN_USER_PASS" else @@ -156,6 +151,11 @@ rm -f /tmp/error.log && mkfifo /tmp/error.log && chown app:app /tmp/error.log unset ADMIN_USER_PASS unset AUTO_CREATE_USER_PASS +find ${SCRIPT_ROOT}/sql/post-init.d/ -type f -name '*.sql' | while read F; do + echo applying SQL patch file: $F + $PSQL -f $F +done + touch $DST_DIR/.app_is_ready exec /usr/sbin/php-fpm83 --nodaemonize --force-stderr |