neingeist/ttrss-docker-compose
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/ttrss-docker-compose synced 2025-11-04 03:14:24 +01:00
Code Issues Releases Wiki Activity

add a hack to send fpm children logs to docker-captured stderr

Browse source
This commit is contained in:
Andrew Dolgov 2021-03-08 09:45:14 +03:00
parent 20a8c65450
commit e2edaf7d03
2 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/Dockerfile
View file

@ -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

9
app/startup.sh
View file

@ -67,8 +67,6 @@ RESTORE_SCHEMA=${SCRIPT_ROOT}/restore-schema.sql.gz
if [ -r $RESTORE_SCHEMA ]; then
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
@ -91,7 +89,10 @@ fi
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
(tail -q -f /tmp/error.log >> /proc/1/fd/2) &
touch $DST_DIR/.app_is_ready
sudo -E -u app /usr/sbin/php-fpm8 -F
exec /usr/sbin/php-fpm8 --nodaemonize --force-stderr