Browse Source

chore(docker): update thegeeklab/nginx digest to 5bcf0a0 (#62)

Co-authored-by: Renovator Bot <renovator@rknet.org>
Co-committed-by: Renovator Bot <renovator@rknet.org>
pull/63/head v1.19.2-4
Renovator Bot 1 month ago committed by Robert Kaussow
parent
commit
6d87ff1e6f
  1. 16
      Dockerfile
  2. 0
      overlay/etc/php8/php-fpm.conf
  3. 10
      overlay/etc/templates/php.ini.tmpl
  4. 5
      overlay/usr/local/bin/entrypoint

16
Dockerfile

@ -1,4 +1,4 @@
FROM thegeeklab/nginx:latest@sha256:76b5b1c0ff5f9e4cd951e952689c03079baf718cd67c4b1e17ac222e40705313
FROM thegeeklab/nginx:latest@sha256:5bcf0a021d468b65c5b3beb685212e98d59d82d272e4fe287f4b8bf9b8e17575
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@ -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-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/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

0
overlay/etc/php7/php-fpm.conf → overlay/etc/php8/php-fpm.conf

10
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
@ -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]

5
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
@ -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
@ -58,5 +57,5 @@ fi
log_info "Start FreshRSS Server\n"
supercronic /etc/crontabs/nginx &
php-fpm7 -F &
php-fpm8 -F &
exec nginx -g "daemon off;"

Loading…
Cancel
Save