From 2fb0d4c4f6eb0b41be681d9c55c8bb51f2b3f30d Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 25 May 2022 13:59:53 +0200 Subject: [PATCH] switch to php8 --- Dockerfile | 14 +++++++------- overlay/etc/{php7 => php8}/php-fpm.conf | 0 overlay/etc/templates/php.ini.tmpl | 8 ++++---- overlay/usr/local/bin/entrypoint | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) rename overlay/etc/{php7 => php8}/php-fpm.conf (100%) diff --git a/Dockerfile b/Dockerfile index 588542a..1acf2a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,19 +15,19 @@ ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.19.2}" ADD overlay/ / RUN apk --update add --virtual .build-deps tar curl && \ - apk --update add php7 php7-curl php7-fpm php7-gmp php7-intl php7-mbstring php7-xml \ - php7-zip php7-ctype php7-dom php7-fileinfo php7-iconv php7-json php7-session \ - php7-simplexml php7-xmlreader php7-zlib php7-pdo_sqlite php7-pdo_mysql\ - php7-pdo_pgsql && \ + apk --update add php8 php8-curl php8-fpm php8-gmp php8-intl php8-mbstring php8-xml \ + php8-zip php8-ctype php8-dom php8-fileinfo php8-iconv php8-json php8-session \ + php8-simplexml php8-xmlreader php8-zlib php8-pdo_sqlite php8-pdo_mysql\ + php8-pdo_pgsql && \ rm -rf /var/www/localhost && \ - rm -f /etc/php7/php-fpm.d/www.conf && \ + rm -f /etc/php8/php-fpm.d/www.conf && \ mkdir -p /var/www/app && \ mkdir /var/www/.postgresql && \ FRESHRSS_VERSION="${FRESHRSS_VERSION##v}" && \ echo "Installing FreshRSS version '${FRESHRSS_VERSION}' ..." && \ curl -SsL "https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz" | \ tar xz -C /var/www/app/ -X /.tarignore --strip-components=1 && \ - curl -SsL -o /etc/php7/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \ + curl -SsL -o /etc/php8/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \ apk del .build-deps && \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* && \ @@ -37,7 +37,7 @@ RUN apk --update add --virtual .build-deps tar curl && \ mkdir -p /var/lib/php/soap_cache && \ mkdir -p /var/lib/php/session && \ chown -R nginx /var/lib/php && \ - chown nginx /etc/php7/php.ini && \ + chown nginx /etc/php8/php.ini && \ chown -R nginx:nginx /var/www/.postgresql && \ chown -R nginx:nginx /var/www/app diff --git a/overlay/etc/php7/php-fpm.conf b/overlay/etc/php8/php-fpm.conf similarity index 100% rename from overlay/etc/php7/php-fpm.conf rename to overlay/etc/php8/php-fpm.conf diff --git a/overlay/etc/templates/php.ini.tmpl b/overlay/etc/templates/php.ini.tmpl index 7b736e6..533cf20 100644 --- a/overlay/etc/templates/php.ini.tmpl +++ b/overlay/etc/templates/php.ini.tmpl @@ -86,12 +86,12 @@ default_charset = "UTF-8" ;input_encoding = ;output_encoding = -;include_path = ".:/php7/includes" +;include_path = ".:/php8/includes" doc_root = user_dir = -extension_dir = "/usr/lib/php7/modules" +extension_dir = "/usr/lib/php8/modules" ;sys_temp_dir = "/tmp" enable_dl = Off @@ -250,7 +250,7 @@ pgsql.log_notice = 0 bcmath.scale = 0 [browscap] -browscap = /etc/php7/browscap.ini +browscap = /etc/php8/browscap.ini [Session] session.save_handler = files @@ -327,7 +327,7 @@ zend.assertions = -1 ;exif.decode_jis_intel = JIS [Tidy] -;tidy.default_config = /usr/local/lib/php7/default.tcfg +;tidy.default_config = /usr/local/lib/php8/default.tcfg tidy.clean_output = Off [soap] diff --git a/overlay/usr/local/bin/entrypoint b/overlay/usr/local/bin/entrypoint index 54f78d7..3242caf 100755 --- a/overlay/usr/local/bin/entrypoint +++ b/overlay/usr/local/bin/entrypoint @@ -3,7 +3,7 @@ # shellcheck disable=SC1091 . /usr/local/lib/log.sh -/usr/local/bin/gomplate -o /etc/php7/php.ini -f /etc/templates/php.ini.tmpl +/usr/local/bin/gomplate -o /etc/php8/php.ini -f /etc/templates/php.ini.tmpl /usr/local/bin/gomplate -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl /usr/local/bin/gomplate -o /var/www/app/constants.local.php -f /etc/templates/constants.local.php.tmpl @@ -58,5 +58,5 @@ fi log_info "Start FreshRSS Server\n" supercronic /etc/crontabs/nginx & -php-fpm7 -F & +php-fpm8 -F & exec nginx -g "daemon off;"