diff options
| author | Andrew Dolgov <[email protected]> | 2024-02-21 21:31:15 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2024-02-21 21:31:15 +0300 |
| commit | ea7d0aa0ea826872edaf99e143e63dc4caf8332c (patch) | |
| tree | c33969bf7aa741117790537a97fb78b05d6e57c3 | |
| parent | fbbcdb168b87421d754382f8aef5ab5fdfc72713 (diff) | |
move to alpine 3.18 & php8.2
| -rw-r--r-- | .docker/app/Dockerfile | 22 | ||||
| -rw-r--r-- | .docker/app/startup.sh | 18 |
2 files changed, 20 insertions, 20 deletions
diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index 44327a7..726ee6c 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -1,25 +1,25 @@ ARG PROXY_REGISTRY -FROM ${PROXY_REGISTRY}alpine:3.16 +FROM ${PROXY_REGISTRY}alpine:3.18 EXPOSE 9000/tcp ENV SCRIPT_ROOT=/opt/epube ENV SRC_DIR=/src/epube -RUN apk add --no-cache php81 php81-fpm \ - php81-pdo php81-gd php81-mbstring php81-pecl-apcu \ - php81-pgsql php81-pdo_pgsql postgresql-client \ - php81-intl php81-xml php81-session php81-opcache \ - php81-dom php81-fileinfo php81-json \ - php81-sqlite3 php81-pdo_sqlite sqlite \ - php81-zip php81-curl php81-openssl git \ - sudo php81-pecl-xdebug rsync && \ - sed -i -e 's/post_max_size = 8M/post_max_size = 64M/' /etc/php81/php.ini && \ +RUN apk add --no-cache php82 php82-fpm \ + php82-pdo php82-gd php82-mbstring php82-pecl-apcu \ + php82-pgsql php82-pdo_pgsql postgresql-client \ + php82-intl php82-xml php82-session php82-opcache \ + php82-dom php82-fileinfo php82-json \ + php82-sqlite3 php82-pdo_sqlite sqlite \ + php82-zip php82-curl php82-openssl git \ + sudo php82-pecl-xdebug rsync && \ + sed -i -e 's/post_max_size = 8M/post_max_size = 64M/' /etc/php82/php.ini && \ sed -i -e 's/^listen = 127.0.0.1:9000/listen = 9000/' \ -e 's/;\(clear_env\) = .*/\1 = no/i' \ -e 's/^\(user\|group\) = .*/\1 = app/i' \ -e 's/;\(php_admin_value\[error_log\]\) = .*/\1 = \/tmp\/error.log/' \ -e 's/;\(php_admin_flag\[log_errors\]\) = .*/\1 = on/' \ - /etc/php81/php-fpm.d/www.conf && \ + /etc/php82/php-fpm.d/www.conf && \ mkdir -p /var/www ${SCRIPT_ROOT}/config.d ARG CI_COMMIT_BRANCH diff --git a/.docker/app/startup.sh b/.docker/app/startup.sh index f4b66b3..d8a892d 100644 --- a/.docker/app/startup.sh +++ b/.docker/app/startup.sh @@ -47,7 +47,7 @@ if [ -r ${SCRIPT_ROOT}/restore.db ]; then fi chown -R $OWNER_UID:$OWNER_GID $DST_DIR \ - /var/log/php81 + /var/log/php82 for d in db sessions; do mkdir -p $DST_DIR/$d @@ -62,9 +62,9 @@ if [ ! -z "${EPUBE_XDEBUG_ENABLED}" ]; then fi echo enabling xdebug with the following parameters: env | grep EPUBE_XDEBUG - cat > /etc/php81/conf.d/50_xdebug.ini <<EOF + cat > /etc/php82/conf.d/50_xdebug.ini <<EOF zend_extension=xdebug.so -xdebug.mode=develop,trace,debug +xdebug.mode=debug xdebug.start_with_request = yes xdebug.client_port = ${EPUBE_XDEBUG_PORT} xdebug.client_host = ${EPUBE_XDEBUG_HOST} @@ -72,21 +72,21 @@ EOF fi sed -i.bak "s/^\(memory_limit\) = \(.*\)/\1 = ${PHP_WORKER_MEMORY_LIMIT}/" \ - /etc/php81/php.ini + /etc/php82/php.ini sed -i.bak "s/^\(pm.max_children\) = \(.*\)/\1 = ${PHP_WORKER_MAX_CHILDREN}/" \ - /etc/php81/php-fpm.d/www.conf + /etc/php82/php-fpm.d/www.conf -sudo -Eu app php81 $DST_DIR/update.php --update-schema=force-yes +sudo -Eu app php82 $DST_DIR/update.php --update-schema=force-yes rm -f /tmp/error.log && mkfifo /tmp/error.log && chown app:app /tmp/error.log (tail -q -f /tmp/error.log >> /proc/1/fd/2) & -if ! sudo -Eu app php81 $DST_DIR/update.php --user-list | grep -q "$EPUBE_ADMIN_USER"; then - sudo -Eu app php81 $DST_DIR/update.php --user-add "$EPUBE_ADMIN_USER:$EPUBE_ADMIN_PASS" +if ! sudo -Eu app php82 $DST_DIR/update.php --user-list | grep -q "$EPUBE_ADMIN_USER"; then + sudo -Eu app php82 $DST_DIR/update.php --user-add "$EPUBE_ADMIN_USER:$EPUBE_ADMIN_PASS" fi touch $DST_DIR/.app_is_ready -exec /usr/sbin/php-fpm81 --nodaemonize --force-stderr -R +exec /usr/sbin/php-fpm82 --nodaemonize --force-stderr -R |