From c1ad9507972f0c4248f481968ba4f29469ccbd15 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 5 Feb 2021 20:07:28 +0300
Subject: [PATCH] initial WIP for php8

---
 app/Dockerfile | 20 ++++++++++----------
 app/startup.sh |  6 +++---
 app/updater.sh |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index 1d778b6..3cde6b2 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -1,11 +1,11 @@
-FROM alpine:3.12
+FROM php:8-fpm-alpine
 EXPOSE 9000/tcp
 
-RUN apk add --no-cache dcron php7 php7-fpm \
-	php7-pdo php7-gd php7-pgsql php7-pdo_pgsql php7-mbstring \
-	php7-intl php7-xml php7-curl php7-session \
-	php7-dom php7-fileinfo php7-json php7-iconv \
-	php7-pcntl php7-posix php7-zip php7-openssl \
+RUN apk add --no-cache dcron php8 php8-fpm \
+	php8-pdo php8-gd php8-pgsql php8-pdo_pgsql php8-mbstring \
+	php8-intl php8-xml php8-curl php8-session \
+	php8-dom php8-fileinfo php8-json php8-iconv \
+	php8-pcntl php8-posix php8-zip php8-openssl \
 	git postgresql-client sudo
 
 ENV SCRIPT_ROOT=/opt/tt-rss
@@ -19,9 +19,9 @@ ADD dcron.sh ${SCRIPT_ROOT}
 ADD backup.sh /etc/periodic/weekly/backup
 ADD config.docker.php ${SCRIPT_ROOT}
 
-RUN sed -i.bak 's/^listen = 127.0.0.1:9000/listen = 9000/' /etc/php7/php-fpm.d/www.conf
-RUN sed -i.bak 's/\(memory_limit =\) 128M/\1 256M/' /etc/php7/php.ini
-RUN sed -i.bak 's/;clear_env = .*/clear_env = no/i' /etc/php7/php-fpm.d/www.conf
+RUN sed -i.bak 's/^listen = 127.0.0.1:9000/listen = 9000/' /etc/php8/php-fpm.d/www.conf
+RUN sed -i.bak 's/\(memory_limit =\) 128M/\1 256M/' /etc/php8/php.ini
+RUN sed -i.bak 's/;clear_env = .*/clear_env = no/i' /etc/php8/php-fpm.d/www.conf
 
 ENV OWNER_UID=1000
 ENV OWNER_GID=1000
@@ -38,7 +38,7 @@ ENV TTRSS_MYSQL_CHARSET="UTF8"
 ENV TTRSS_SELF_URL_PATH="%SELF_URL_PATH"
 ENV TTRSS_SINGLE_USER_MODE=""
 ENV TTRSS_SIMPLE_UPDATE_MODE=""
-ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php"
+ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php8"
 ENV TTRSS_LOCK_DIRECTORY="lock"
 ENV TTRSS_CACHE_DIR="cache"
 ENV TTRSS_ICONS_DIR="feed-icons"
diff --git a/app/startup.sh b/app/startup.sh
index 69a6a90..7270c32 100755
--- a/app/startup.sh
+++ b/app/startup.sh
@@ -53,7 +53,7 @@ else
 fi
 
 chown -R $OWNER_UID:$OWNER_GID $DST_DIR \
-	/var/log/php7
+	/var/log/php8
 
 for d in cache lock feed-icons; do
 	chmod 777 $DST_DIR/$d
@@ -83,9 +83,9 @@ fi
 # this was previously generated
 rm -f $DST_DIR/config.php.bak
 
-cd $DST_DIR && sudo -E -u app php ./update.php --update-schema=force-yes
+cd $DST_DIR && sudo -E -u app php8 ./update.php --update-schema=force-yes
 
 touch $DST_DIR/.app_is_ready
 
-sudo -E -u app /usr/sbin/php-fpm7 -F
+sudo -E -u app /usr/sbin/php-fpm8 -F
 
diff --git a/app/updater.sh b/app/updater.sh
index af994cd..60627e7 100755
--- a/app/updater.sh
+++ b/app/updater.sh
@@ -24,4 +24,4 @@ while [ ! -s $DST_DIR/config.php -a -e $DST_DIR/.app_is_ready ]; do
 	sleep 3
 done
 
-sudo -E -u app /usr/bin/php /var/www/html/tt-rss/update_daemon2.php
+sudo -E -u app /usr/bin/php8 /var/www/html/tt-rss/update_daemon2.php