diff --git a/Dockerfile b/Dockerfile index 75f6ca1..c2bb531 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thegeeklab/nginx:latest@sha256:3fe26c27e21936e5a71b6c8179f50768e655d983177cd1a981551bf59bfe1c6f +FROM thegeeklab/nginx:latest@sha256:1b4a55c078486ffab6b8bb96def236b47f07574f5966cedcf9ce68de0d529fe8 LABEL maintainer="Robert Kaussow " LABEL org.opencontainers.image.authors="Robert Kaussow " @@ -15,19 +15,19 @@ ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.20.1}" ADD overlay/ / RUN apk --update add --virtual .build-deps tar curl && \ - 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-opcache php8-phar \ - php8-session php8-simplexml php8-xmlreader php8-xmlwriter php8-tokenizer php8-zlib \ - php8-openssl php8-pdo_sqlite php8-pdo_mysql php8-pdo_pgsql && \ + apk --update add php81 php81-curl php81-fpm php81-gmp php81-intl php81-mbstring php81-xml \ + php81-zip php81-ctype php81-dom php81-fileinfo php81-iconv php81-json php81-opcache php81-phar \ + php81-session php81-simplexml php81-xmlreader php81-xmlwriter php81-tokenizer php81-zlib \ + php81-openssl php81-pdo_sqlite php81-pdo_mysql php81-pdo_pgsql && \ rm -rf /var/www/localhost && \ - rm -f /etc/php8/php-fpm.d/www.conf && \ + rm -f /etc/php81/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 -SsfL "https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz" | \ tar xz -C /var/www/app/ -X /.tarignore --strip-components=1 && \ - curl -SsfL -o /etc/php8/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \ + curl -SsfL -o /etc/php81/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/php8/php.ini && \ + chown nginx /etc/php81/php.ini && \ chown -R nginx:nginx /var/www/.postgresql && \ chown -R nginx:nginx /var/www/app diff --git a/overlay/etc/php8/php-fpm.conf b/overlay/etc/php81/php-fpm.conf similarity index 100% rename from overlay/etc/php8/php-fpm.conf rename to overlay/etc/php81/php-fpm.conf diff --git a/overlay/etc/templates/php.ini.tmpl b/overlay/etc/templates/php.ini.tmpl index 0772582..8ae94ac 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 = ".:/php8/includes" +;include_path = ".:/php81/includes" doc_root = user_dir = -extension_dir = "/usr/lib/php8/modules" +extension_dir = "/usr/lib/php81/modules" ;sys_temp_dir = "/tmp" enable_dl = Off @@ -250,7 +250,7 @@ pgsql.log_notice = 0 bcmath.scale = 0 [browscap] -browscap = /etc/php8/browscap.ini +browscap = /etc/php81/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/php8/default.tcfg +;tidy.default_config = /usr/local/lib/php81/default.tcfg tidy.clean_output = Off [soap] diff --git a/overlay/usr/local/bin/entrypoint b/overlay/usr/local/bin/entrypoint index c702292..6b34d4e 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/php8/php.ini -f /etc/templates/php.ini.tmpl +/usr/local/bin/gomplate -o /etc/php81/php.ini -f /etc/templates/php.ini.tmpl /usr/local/bin/gomplate -o /var/www/app/constants.local.php -f /etc/templates/constants.local.php.tmpl if [ -n "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" ] && [ ! -f "/var/www/.postgresql/root.crt" ]; then @@ -56,5 +56,5 @@ fi log_info "Start FreshRSS Server\n" supercronic /etc/crontabs/nginx & -php-fpm8 -F & +php-fpm81 -F & exec nginx -g "daemon off;"