From 096f803f2f86db3a40156c9d166781738f01ff15 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Thu, 5 Dec 2024 15:59:30 +0000
Subject: Bump to Alpine 3.21 and PHP 8.4.

* https://alpinelinux.org/posts/Alpine-3.21.0-released.html
* https://www.php.net/releases/8.4/en.php
---
 .docker/app/Dockerfile | 20 ++++++++++----------
 .docker/app/startup.sh | 26 +++++++++++++-------------
 .docker/app/updater.sh |  4 ++--
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile
index 8662e322f..a9e15ee88 100644
--- a/.docker/app/Dockerfile
+++ b/.docker/app/Dockerfile
@@ -1,6 +1,6 @@
 ARG PROXY_REGISTRY
 
-FROM ${PROXY_REGISTRY}alpine:3.20
+FROM ${PROXY_REGISTRY}alpine:3.21
 EXPOSE 9000/tcp
 
 ARG ALPINE_MIRROR
@@ -10,13 +10,13 @@ ENV SRC_DIR=/src/tt-rss/
 
 RUN [ ! -z ${ALPINE_MIRROR} ] && \
 		sed -i.bak "s#dl-cdn.alpinelinux.org#${ALPINE_MIRROR}#" /etc/apk/repositories ; \
-	apk add --no-cache dcron php83 php83-fpm php83-phar php83-sockets php83-pecl-apcu \
-	php83-pdo php83-gd php83-pgsql php83-pdo_pgsql php83-xmlwriter php83-opcache \
-	php83-mbstring php83-intl php83-xml php83-curl php83-simplexml \
-	php83-session php83-tokenizer php83-dom php83-fileinfo php83-ctype \
-	php83-json php83-iconv php83-pcntl php83-posix php83-zip php83-exif \
-	php83-openssl git postgresql-client sudo php83-pecl-xdebug rsync tzdata && \
-	sed -i 's/\(memory_limit =\) 128M/\1 256M/' /etc/php83/php.ini && \
+	apk add --no-cache dcron php84 php84-fpm php84-phar php84-sockets php84-pecl-apcu \
+	php84-pdo php84-gd php84-pgsql php84-pdo_pgsql php84-xmlwriter php84-opcache \
+	php84-mbstring php84-intl php84-xml php84-curl php84-simplexml \
+	php84-session php84-tokenizer php84-dom php84-fileinfo php84-ctype \
+	php84-json php84-iconv php84-pcntl php84-posix php84-zip php84-exif \
+	php84-openssl git postgresql-client sudo php84-pecl-xdebug rsync tzdata && \
+	sed -i 's/\(memory_limit =\) 128M/\1 256M/' /etc/php84/php.ini && \
 	sed -i -e 's/^listen = 127.0.0.1:9000/listen = 9000/' \
 		-e 's/;\(clear_env\) = .*/\1 = no/i' \
 		-e 's/;\(pm.status_path = \/status\)/\1/i' \
@@ -24,7 +24,7 @@ RUN [ ! -z ${ALPINE_MIRROR} ] && \
 		-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/php83/php-fpm.d/www.conf && \
+			/etc/php84/php-fpm.d/www.conf && \
 	mkdir -p /var/www ${SCRIPT_ROOT}/config.d ${SCRIPT_ROOT}/sql/post-init.d
 
 ARG CI_COMMIT_BRANCH
@@ -92,7 +92,7 @@ ENV TTRSS_DB_HOST="db"
 ENV TTRSS_DB_PORT="5432"
 
 ENV TTRSS_MYSQL_CHARSET="UTF8"
-ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php83"
+ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php84"
 ENV TTRSS_PLUGINS="auth_internal, note, nginx_xaccel"
 
 CMD ${SCRIPT_ROOT}/startup.sh
diff --git a/.docker/app/startup.sh b/.docker/app/startup.sh
index 86b10b746..934bedcf6 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/php83
+	/var/log/php84
 
 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/php83/conf.d/50_xdebug.ini <<EOF
+	cat > /etc/php84/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/php83/php.ini
+	/etc/php84/php.ini
 
 sed -i.bak "s/^\(pm.max_children\) = \(.*\)/\1 = ${PHP_WORKER_MAX_CHILDREN}/" \
-	/etc/php83/php-fpm.d/www.conf
+	/etc/php84/php-fpm.d/www.conf
 
-sudo -Eu app php83 $DST_DIR/update.php --update-schema=force-yes
+sudo -Eu app php84 $DST_DIR/update.php --update-schema=force-yes
 
 if [ ! -z "$ADMIN_USER_PASS" ]; then
-	sudo -Eu app php83 $DST_DIR/update.php --user-set-password "admin:$ADMIN_USER_PASS"
+	sudo -Eu app php84 $DST_DIR/update.php --user-set-password "admin:$ADMIN_USER_PASS"
 else
-	if sudo -Eu app php83 $DST_DIR/update.php --user-check-password "admin:password"; then
+	if sudo -Eu app php84 $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 php83 $DST_DIR/update.php --user-set-password "admin:$RANDOM_PASS"
+		sudo -Eu app php84 $DST_DIR/update.php --user-set-password "admin:$RANDOM_PASS"
 	fi
 fi
 
 if [ ! -z "$ADMIN_USER_ACCESS_LEVEL" ]; then
-	sudo -Eu app php83 $DST_DIR/update.php --user-set-access-level "admin:$ADMIN_USER_ACCESS_LEVEL"
+	sudo -Eu app php84 $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 "php83 $DST_DIR/update.php --user-exists $AUTO_CREATE_USER ||
-		php83 $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 "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\""
 
 	if [ ! -z "$AUTO_CREATE_USER_ENABLE_API" ]; then
 		# TODO: remove || true later
-		sudo -Eu app /bin/sh -c "php83 $DST_DIR/update.php --user-enable-api \"$AUTO_CREATE_USER:$AUTO_CREATE_USER_ENABLE_API\"" || true
+		sudo -Eu app /bin/sh -c "php84 $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-fpm83 --nodaemonize --force-stderr
+exec /usr/sbin/php-fpm84 --nodaemonize --force-stderr
diff --git a/.docker/app/updater.sh b/.docker/app/updater.sh
index 66e0b7e5c..378ac930b 100644
--- a/.docker/app/updater.sh
+++ b/.docker/app/updater.sh
@@ -21,7 +21,7 @@ while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER -p $TTRSS_DB_PORT; do
 done
 
 sed -i.bak "s/^\(memory_limit\) = \(.*\)/\1 = ${PHP_WORKER_MEMORY_LIMIT}/" \
-	/etc/php83/php.ini
+	/etc/php84/php.ini
 
 DST_DIR=/var/www/html/tt-rss
 
@@ -30,4 +30,4 @@ while [ ! -s $DST_DIR/config.php -a -e $DST_DIR/.app_is_ready ]; do
 	sleep 3
 done
 
-sudo -E -u app /usr/bin/php83 /var/www/html/tt-rss/update_daemon2.php "$@"
+sudo -E -u app /usr/bin/php84 /var/www/html/tt-rss/update_daemon2.php "$@"
-- 
cgit v1.2.3-54-g00ecf