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

initial WIP for php8

Browse source
This commit is contained in:
Andrew Dolgov 2021-02-05 20:07:28 +03:00
parent 5b17a78afc
commit c1ad950797
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/Dockerfile
View file

@ -1,11 +1,11 @@
FROM alpine:3.12 FROM php:8-fpm-alpine
EXPOSE 9000/tcp EXPOSE 9000/tcp
RUN apk add --no-cache dcron php7 php7-fpm \ RUN apk add --no-cache dcron php8 php8-fpm \
php7-pdo php7-gd php7-pgsql php7-pdo_pgsql php7-mbstring \ php8-pdo php8-gd php8-pgsql php8-pdo_pgsql php8-mbstring \
php7-intl php7-xml php7-curl php7-session \ php8-intl php8-xml php8-curl php8-session \
php7-dom php7-fileinfo php7-json php7-iconv \ php8-dom php8-fileinfo php8-json php8-iconv \
php7-pcntl php7-posix php7-zip php7-openssl \ php8-pcntl php8-posix php8-zip php8-openssl \
git postgresql-client sudo git postgresql-client sudo
ENV SCRIPT_ROOT=/opt/tt-rss ENV SCRIPT_ROOT=/opt/tt-rss
@ -19,9 +19,9 @@ ADD dcron.sh ${SCRIPT_ROOT}
ADD backup.sh /etc/periodic/weekly/backup ADD backup.sh /etc/periodic/weekly/backup
ADD config.docker.php ${SCRIPT_ROOT} 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/^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/php7/php.ini 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/php7/php-fpm.d/www.conf RUN sed -i.bak 's/;clear_env = .*/clear_env = no/i' /etc/php8/php-fpm.d/www.conf
ENV OWNER_UID=1000 ENV OWNER_UID=1000
ENV OWNER_GID=1000 ENV OWNER_GID=1000
@ -38,7 +38,7 @@ ENV TTRSS_MYSQL_CHARSET="UTF8"
ENV TTRSS_SELF_URL_PATH="%SELF_URL_PATH" ENV TTRSS_SELF_URL_PATH="%SELF_URL_PATH"
ENV TTRSS_SINGLE_USER_MODE="" ENV TTRSS_SINGLE_USER_MODE=""
ENV TTRSS_SIMPLE_UPDATE_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_LOCK_DIRECTORY="lock"
ENV TTRSS_CACHE_DIR="cache" ENV TTRSS_CACHE_DIR="cache"
ENV TTRSS_ICONS_DIR="feed-icons" ENV TTRSS_ICONS_DIR="feed-icons"

6
app/startup.sh
View file

@ -53,7 +53,7 @@ else
fi fi
chown -R $OWNER_UID:$OWNER_GID $DST_DIR \ chown -R $OWNER_UID:$OWNER_GID $DST_DIR \
/var/log/php7 /var/log/php8
for d in cache lock feed-icons; do for d in cache lock feed-icons; do
chmod 777 $DST_DIR/$d chmod 777 $DST_DIR/$d
@ -83,9 +83,9 @@ fi
# this was previously generated # this was previously generated
rm -f $DST_DIR/config.php.bak 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 touch $DST_DIR/.app_is_ready
sudo -E -u app /usr/sbin/php-fpm7 -F sudo -E -u app /usr/sbin/php-fpm8 -F

2
app/updater.sh
View file

@ -24,4 +24,4 @@ while [ ! -s $DST_DIR/config.php -a -e $DST_DIR/.app_is_ready ]; do
sleep 3 sleep 3
done 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