diff --git a/src/app/Dockerfile b/src/app/Dockerfile index 1b4277a..dac6d81 100644 --- a/src/app/Dockerfile +++ b/src/app/Dockerfile @@ -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} @@ -72,7 +72,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 diff --git a/src/app/startup.sh b/src/app/startup.sh index 74598ec..cf3b420 100755 --- a/src/app/startup.sh +++ b/src/app/startup.sh @@ -62,7 +62,7 @@ sudo -u app cp ${SCRIPT_ROOT}/config.docker.php $DST_DIR/config.php chmod 644 $DST_DIR/config.php chown -R $OWNER_UID:$OWNER_GID $DST_DIR \ - /var/log/php81 + /var/log/php8 if [ -z "$TTRSS_NO_STARTUP_PLUGIN_UPDATES" ]; then echo updating all local plugins... @@ -101,7 +101,7 @@ if [ ! -z "${TTRSS_XDEBUG_ENABLED}" ]; then fi echo enabling xdebug with the following parameters: env | grep TTRSS_XDEBUG - cat > /etc/php81/conf.d/50_xdebug.ini < /etc/php8/conf.d/50_xdebug.ini <