move sql patch file stuff after all initialization tasks
This commit is contained in:
@@ -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}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user