From 63da5e550a938dd85bd1a3f2a47228d3a6861a50 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 29 Mar 2021 15:48:40 +0300 Subject: [PATCH] php8 -> php7 --- app/Dockerfile | 20 ++++++++++---------- app/startup.sh | 8 ++++---- app/updater.sh | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/Dockerfile b/app/Dockerfile index 411c289..efdc4aa 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,21 +1,21 @@ -FROM alpine:3.13 +FROM alpine:3.12 EXPOSE 9000/tcp ENV SCRIPT_ROOT=/opt/tt-rss -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 && \ +RUN apk add --no-cache dcron php7 php7-fpm \ + php7-pdo php7-gd php7-pgsql php7-pdo_pgsql \ + php7-mbstring php7-intl php7-xml php7-curl \ + php7-session php7-tokenizer php7-dom php7-fileinfo \ + php7-json php7-iconv php7-pcntl php7-posix php7-zip php7-exif \ + php7-openssl git postgresql-client sudo php7-pecl-xdebug rsync && \ + sed -i 's/\(memory_limit =\) 128M/\1 256M/' /etc/php7/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 && \ + /etc/php7/php-fpm.d/www.conf && \ mkdir -p /var/www ${SCRIPT_ROOT}/config.d ADD startup.sh ${SCRIPT_ROOT} @@ -38,7 +38,7 @@ ENV TTRSS_DB_HOST="db" ENV TTRSS_DB_PORT="5432" ENV TTRSS_MYSQL_CHARSET="UTF8" -ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php8" +ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php7" ENV TTRSS_PLUGINS="auth_internal, note, nginx_xaccel" CMD ${SCRIPT_ROOT}/startup.sh diff --git a/app/startup.sh b/app/startup.sh index cef538a..b120aee 100755 --- a/app/startup.sh +++ b/app/startup.sh @@ -58,7 +58,7 @@ 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/php8 + /var/log/php7 for d in cache lock feed-icons; do chmod 777 $DST_DIR/$d @@ -83,7 +83,7 @@ if [ ! -z "${TTRSS_XDEBUG_ENABLED}" ]; then fi echo enabling xdebug with the following parameters: env | grep TTRSS_XDEBUG - cat > /etc/php8/conf.d/50_xdebug.ini < /etc/php7/conf.d/50_xdebug.ini <