From 9c3ca9afb8e6f271dec00c4aa9f3908e4da47f77 Mon Sep 17 00:00:00 2001 From: Renovator Bot Date: Tue, 24 May 2022 07:01:53 +0000 Subject: [PATCH 1/3] chore(docker): update thegeeklab/nginx digest to 5bcf0a0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0753bd3..588542a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thegeeklab/nginx:latest@sha256:76b5b1c0ff5f9e4cd951e952689c03079baf718cd67c4b1e17ac222e40705313 +FROM thegeeklab/nginx:latest@sha256:5bcf0a021d468b65c5b3beb685212e98d59d82d272e4fe287f4b8bf9b8e17575 LABEL maintainer="Robert Kaussow " LABEL org.opencontainers.image.authors="Robert Kaussow " -- 2.45.2 From 2fb0d4c4f6eb0b41be681d9c55c8bb51f2b3f30d Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 25 May 2022 13:59:53 +0200 Subject: [PATCH 2/3] 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;" -- 2.45.2 From e8a328ed50e1efe3f8becb7f544234b8cadd24af Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 25 May 2022 15:06:15 +0200 Subject: [PATCH 3/3] cleanup --- Dockerfile | 6 +++--- overlay/etc/templates/php.ini.tmpl | 2 +- overlay/usr/local/bin/entrypoint | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1acf2a4..99d883c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,9 @@ 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-session \ - php8-simplexml php8-xmlreader php8-zlib php8-pdo_sqlite php8-pdo_mysql\ - php8-pdo_pgsql && \ + 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-pdo_sqlite php8-pdo_mysql php8-pdo_pgsql && \ rm -rf /var/www/localhost && \ rm -f /etc/php8/php-fpm.d/www.conf && \ mkdir -p /var/www/app && \ diff --git a/overlay/etc/templates/php.ini.tmpl b/overlay/etc/templates/php.ini.tmpl index 533cf20..0772582 100644 --- a/overlay/etc/templates/php.ini.tmpl +++ b/overlay/etc/templates/php.ini.tmpl @@ -21,7 +21,7 @@ serialize_precision = 17 open_basedir = "/var/www/app:/var/lib/php/tmp_upload:/var/lib/php/session:/var/lib/php/soap_cache" -disable_functions = system, exec, shell_exec, phpinfo, show_source, highlight_file, popen, proc_open, fopen_with_path, dbmopen, dbase_open, move_uploaded_file, chmod, rename, filepro, filepro_rowcount, filepro_retrieve, posix_mkfifo +disable_functions = system, exec, shell_exec, phpinfo, show_source, highlight_file, popen, proc_open, fopen_with_path, dbmopen, dbase_open, move_uploaded_file, chmod, filepro, filepro_rowcount, filepro_retrieve, posix_mkfifo disable_classes = ;highlight.string = #DD0000 diff --git a/overlay/usr/local/bin/entrypoint b/overlay/usr/local/bin/entrypoint index 3242caf..3c314f1 100755 --- a/overlay/usr/local/bin/entrypoint +++ b/overlay/usr/local/bin/entrypoint @@ -50,7 +50,6 @@ if [ "${FRESHRSS_DEFAULT_USER}" ]; then log_info "FreshRSS user successfully created" ./cli/list-users.php | xargs -n1 ./cli/actualize-user.php --user "$FRESHRSS_DEFAULT_USER" else - rm -f /tmp/out.txt /tmp/err.txt log_error "FreshRSS error during the creation of a user: ${ERROR}" exit $EXITCODE fi -- 2.45.2