kienan
/
ttrss-container
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revise previous

This commit is contained in:
Andrew Dolgov 2022-04-10 07:47:24 +03:00
parent 731725fb4e
commit 46a7d19374
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Dockerfile
View File

@ -31,6 +31,11 @@ ENV OWNER_GID=1000
ENV PHP_WORKER_MAX_CHILDREN=5 ENV PHP_WORKER_MAX_CHILDREN=5
ENV PHP_WORKER_MEMORY_LIMIT=256M 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) # don't try to update local plugins on startup (except for nginx_xaccel)
ENV TTRSS_NO_STARTUP_PLUGIN_UPDATES="" ENV TTRSS_NO_STARTUP_PLUGIN_UPDATES=""

12
app/startup.sh
View File

@ -112,6 +112,12 @@ xdebug.client_host = ${TTRSS_XDEBUG_HOST}
EOF EOF
fi 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 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 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 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 exec /usr/sbin/php-fpm8 --nodaemonize --force-stderr -R

3
app/updater.sh
View File

@ -24,6 +24,9 @@ done
DST_DIR=/var/www/html/tt-rss 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 while [ ! -s $DST_DIR/config.php -a -e $DST_DIR/.app_is_ready ]; do
echo waiting for app container... echo waiting for app container...
sleep 3 sleep 3