From 46a7d193742d24d3a910ef910ac3b6c940185975 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 10 Apr 2022 07:47:24 +0300
Subject: [PATCH] revise previous

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

diff --git a/app/Dockerfile b/app/Dockerfile
index 311ccc4..dcb1bf9 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -31,6 +31,11 @@ ENV OWNER_GID=1000
 ENV PHP_WORKER_MAX_CHILDREN=5
 ENV PHP_WORKER_MEMORY_LIMIT=256M
 
+# TODO: remove prefix from container variables not used by tt-rss itself:
+#
+# - TTRSS_NO_STARTUP_PLUGIN_UPDATES -> NO_STARTUP_PLUGIN_UPDATES
+# - TTRSS_XDEBUG_... -> XDEBUG_...
+
 # don't try to update local plugins on startup (except for nginx_xaccel)
 ENV TTRSS_NO_STARTUP_PLUGIN_UPDATES=""
 
diff --git a/app/startup.sh b/app/startup.sh
index 70adf2a..e3fb6f3 100755
--- a/app/startup.sh
+++ b/app/startup.sh
@@ -112,6 +112,12 @@ xdebug.client_host = ${TTRSS_XDEBUG_HOST}
 EOF
 fi
 
+sed -i.bak "s/^\(memory_limit\) = \(.*\)/\1 = ${PHP_WORKER_MEMORY_LIMIT}/" \
+	/etc/php8/php.ini
+
+sed -i.bak "s/^\(pm.max_children\) = \(.*\)/\1 = ${PHP_WORKER_MAX_CHILDREN}/" \
+	/etc/php8/php-fpm.d/www.conf
+
 cd $DST_DIR && sudo -E -u app php8 ./update.php --update-schema=force-yes
 
 rm -f /tmp/error.log && mkfifo /tmp/error.log && chown app:app /tmp/error.log
@@ -120,10 +126,4 @@ rm -f /tmp/error.log && mkfifo /tmp/error.log && chown app:app /tmp/error.log
 
 touch $DST_DIR/.app_is_ready
 
-sed -i.bak "s/^\(memory_limit\) = \(.*\)/\1 = ${PHP_WORKER_MEMORY_LIMIT}/" \
-	/etc/php8/php.ini
-
-sed -i.bak "s/^\(pm.max_children\) = \(.*\)/\1 = ${PHP_WORKER_MAX_CHILDREN}/" \
-	/etc/php8/php-fpm.d/www.conf
-
 exec /usr/sbin/php-fpm8 --nodaemonize --force-stderr -R
diff --git a/app/updater.sh b/app/updater.sh
index 9a682b2..9cce8d9 100755
--- a/app/updater.sh
+++ b/app/updater.sh
@@ -24,6 +24,9 @@ done
 
 DST_DIR=/var/www/html/tt-rss
 
+sed -i.bak "s/^\(memory_limit\) = \(.*\)/\1 = ${PHP_WORKER_MEMORY_LIMIT}/" \
+	/etc/php8/php.ini
+
 while [ ! -s $DST_DIR/config.php -a -e $DST_DIR/.app_is_ready ]; do
 	echo waiting for app container...
 	sleep 3