neingeist/ttrss-docker-compose
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/ttrss-docker-compose synced 2025-06-09 16:19:53 +02:00
Code Issues Releases Wiki Activity

Revert "switch to php 8.1"

Browse source 
because of readability

This reverts commit 165d2fdd6f.
This commit is contained in:
Andrew Dolgov 2022-07-16 11:14:02 +03:00
parent 165d2fdd6f
commit 9a19d11d1a
No known key found for this signature in database
GPG key ID: 1A56B4FA25D4AF2A
3 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/Dockerfile
View file

@ -1,21 +1,21 @@
FROM alpine:3.16
FROM alpine:3.14
EXPOSE 9000/tcp
ENV SCRIPT_ROOT=/opt/tt-rss
RUN apk add --no-cache dcron php81 php81-fpm \
php81-pdo php81-gd php81-pgsql php81-pdo_pgsql \
php81-mbstring php81-intl php81-xml php81-curl \
php81-session php81-tokenizer php81-dom php81-fileinfo \
php81-json php81-iconv php81-pcntl php81-posix php81-zip php81-exif \
php81-openssl git postgresql-client sudo php81-pecl-xdebug rsync && \
sed -i 's/\(memory_limit =\) 128M/\1 256M/' /etc/php81/php.ini && \
RUN apk add --no-cache dcron php8 php8-fpm \
php8-pdo php8-gd php8-pgsql php8-pdo_pgsql \
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-exif \
php8-openssl git postgresql-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/php81/php-fpm.d/www.conf && \
/etc/php8/php-fpm.d/www.conf && \
mkdir -p /var/www ${SCRIPT_ROOT}/config.d
ADD startup.sh ${SCRIPT_ROOT}
@ -61,7 +61,7 @@ ENV TTRSS_DB_HOST="db"
ENV TTRSS_DB_PORT="5432"
ENV TTRSS_MYSQL_CHARSET="UTF8"
ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php81"
ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php8"
ENV TTRSS_PLUGINS="auth_internal, note, nginx_xaccel"
CMD ${SCRIPT_ROOT}/startup.sh