Merge branch 'mariadb-unsupported' of git.tt-rss.org:fox/ttrss-docker-compose into mariadb-unsupported

app/Dockerfile

@@ -1,16 +1,22 @@
 FROM alpine:3.13
 EXPOSE 9000/tcp
 
-RUN apk add --no-cache dcron php8 php8-fpm \
-	php8-pdo php8-gd php8-mysqlnd php8-pdo_mysql 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 mysql-client sudo php8-pecl-xdebug
-
 ENV SCRIPT_ROOT=/opt/tt-rss
 
-RUN mkdir -p /var/www ${SCRIPT_ROOT}/config.d
+RUN apk add --no-cache dcron php8 php8-fpm \
+	php8-pdo php8-gd php8-mysqlnd php8-pdo_mysql \
+	php8-mbstring php8-intl php8-xml php8-curl \
+	php8-session php8-tokenizer php8-dom php8-fileinfo \
+	php8-json php8-iconv php8-pcntl php8-posix php8-zip \
+	php8-openssl git mysql-client sudo php8-pecl-xdebug rsync && \
+	sed -i 's/\(memory_limit =\) 128M/\1 256M/' /etc/php8/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/php8/php-fpm.d/www.conf && \
+	mkdir -p /var/www ${SCRIPT_ROOT}/config.d
 
 ADD startup.sh ${SCRIPT_ROOT}
 ADD updater.sh ${SCRIPT_ROOT}
@@ -19,10 +25,6 @@ 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/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
 

app/startup.sh

@@ -78,9 +78,8 @@ done
 RESTORE_SCHEMA=${SCRIPT_ROOT}/restore-schema.sql.gz
 
 if [ -r $RESTORE_SCHEMA ]; then
+	# TODO: drop/recreate database?
 	zcat $RESTORE_SCHEMA | $PSQL
-elif ! $PSQL -e 'select * from ttrss_version'; then
-	$PSQL < /var/www/html/tt-rss/schema/ttrss_schema_mysql.sql
 fi
 
 # this was previously generated
@@ -103,7 +102,10 @@ fi
 
 cd $DST_DIR && sudo -E -u app php8 ./update.php --update-schema=force-yes
 
-touch $DST_DIR/.app_is_ready
+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) &
 
-sudo -E -u app /usr/sbin/php-fpm8 -F
+touch $DST_DIR/.app_is_ready
 
+exec /usr/sbin/php-fpm8 --nodaemonize --force-stderr

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - MYSQL_ROOT_PASSWORD=${TTRSS_DB_PASS}
       - MYSQL_DATABASE=${TTRSS_DB_NAME}
     volumes:
-      - db:/var/lib/postgresql/data
+      - db:/var/lib/mysql
 
   app:
     build: