diff options
Diffstat (limited to '.docker/app/startup.sh')
| -rw-r--r-- | .docker/app/startup.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/.docker/app/startup.sh b/.docker/app/startup.sh index 934bedcf6..cf93b7413 100644 --- a/.docker/app/startup.sh +++ b/.docker/app/startup.sh @@ -65,7 +65,7 @@ sudo -u app cp ${SCRIPT_ROOT}/config.docker.php $DST_DIR/config.php chmod 644 $DST_DIR/config.php chown -R $OWNER_UID:$OWNER_GID $DST_DIR \ - /var/log/php84 + /var/log/php${PHP_SUFFIX} if [ -z "$TTRSS_NO_STARTUP_PLUGIN_UPDATES" ]; then echo updating all local plugins... @@ -97,7 +97,7 @@ if [ ! -z "${TTRSS_XDEBUG_ENABLED}" ]; then fi echo enabling xdebug with the following parameters: env | grep TTRSS_XDEBUG - cat > /etc/php84/conf.d/50_xdebug.ini <<EOF + cat > /etc/php${PHP_SUFFIX}/conf.d/50_xdebug.ini <<EOF zend_extension=xdebug.so xdebug.mode=debug xdebug.start_with_request = yes @@ -107,17 +107,17 @@ EOF fi sed -i.bak "s/^\(memory_limit\) = \(.*\)/\1 = ${PHP_WORKER_MEMORY_LIMIT}/" \ - /etc/php84/php.ini + /etc/php${PHP_SUFFIX}/php.ini sed -i.bak "s/^\(pm.max_children\) = \(.*\)/\1 = ${PHP_WORKER_MAX_CHILDREN}/" \ - /etc/php84/php-fpm.d/www.conf + /etc/php${PHP_SUFFIX}/php-fpm.d/www.conf -sudo -Eu app php84 $DST_DIR/update.php --update-schema=force-yes +sudo -Eu app php${PHP_SUFFIX} $DST_DIR/update.php --update-schema=force-yes if [ ! -z "$ADMIN_USER_PASS" ]; then - sudo -Eu app php84 $DST_DIR/update.php --user-set-password "admin:$ADMIN_USER_PASS" + sudo -Eu app php${PHP_SUFFIX} $DST_DIR/update.php --user-set-password "admin:$ADMIN_USER_PASS" else - if sudo -Eu app php84 $DST_DIR/update.php --user-check-password "admin:password"; then + if sudo -Eu app php${PHP_SUFFIX} $DST_DIR/update.php --user-check-password "admin:password"; then RANDOM_PASS=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 16 ; echo '') echo "*****************************************************************************" @@ -125,21 +125,21 @@ else echo "* If you want to set it manually, use ADMIN_USER_PASS environment variable. *" echo "*****************************************************************************" - sudo -Eu app php84 $DST_DIR/update.php --user-set-password "admin:$RANDOM_PASS" + sudo -Eu app php${PHP_SUFFIX} $DST_DIR/update.php --user-set-password "admin:$RANDOM_PASS" fi fi if [ ! -z "$ADMIN_USER_ACCESS_LEVEL" ]; then - sudo -Eu app php84 $DST_DIR/update.php --user-set-access-level "admin:$ADMIN_USER_ACCESS_LEVEL" + sudo -Eu app php${PHP_SUFFIX} $DST_DIR/update.php --user-set-access-level "admin:$ADMIN_USER_ACCESS_LEVEL" fi if [ ! -z "$AUTO_CREATE_USER" ]; then - sudo -Eu app /bin/sh -c "php84 $DST_DIR/update.php --user-exists $AUTO_CREATE_USER || - php84 $DST_DIR/update.php --force-yes --user-add \"$AUTO_CREATE_USER:$AUTO_CREATE_USER_PASS:$AUTO_CREATE_USER_ACCESS_LEVEL\"" + sudo -Eu app /bin/sh -c "php${PHP_SUFFIX} $DST_DIR/update.php --user-exists $AUTO_CREATE_USER || + php${PHP_SUFFIX} $DST_DIR/update.php --force-yes --user-add \"$AUTO_CREATE_USER:$AUTO_CREATE_USER_PASS:$AUTO_CREATE_USER_ACCESS_LEVEL\"" if [ ! -z "$AUTO_CREATE_USER_ENABLE_API" ]; then # TODO: remove || true later - sudo -Eu app /bin/sh -c "php84 $DST_DIR/update.php --user-enable-api \"$AUTO_CREATE_USER:$AUTO_CREATE_USER_ENABLE_API\"" || true + sudo -Eu app /bin/sh -c "php${PHP_SUFFIX} $DST_DIR/update.php --user-enable-api \"$AUTO_CREATE_USER:$AUTO_CREATE_USER_ENABLE_API\"" || true fi fi @@ -158,4 +158,4 @@ done touch $DST_DIR/.app_is_ready -exec /usr/sbin/php-fpm84 --nodaemonize --force-stderr +exec /usr/sbin/php-fpm${PHP_SUFFIX} --nodaemonize --force-stderr |