chore(docker): update thegeeklab/nginx digest to 5bcf0a0 #62
14
Dockerfile
14
Dockerfile
|
@ -15,19 +15,19 @@ ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.19.2}"
|
||||||
ADD overlay/ /
|
ADD overlay/ /
|
||||||
|
|
||||||
RUN apk --update add --virtual .build-deps tar curl && \
|
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 \
|
apk --update add php8 php8-curl php8-fpm php8-gmp php8-intl php8-mbstring php8-xml \
|
||||||
php7-zip php7-ctype php7-dom php7-fileinfo php7-iconv php7-json php7-session \
|
php8-zip php8-ctype php8-dom php8-fileinfo php8-iconv php8-json php8-session \
|
||||||
php7-simplexml php7-xmlreader php7-zlib php7-pdo_sqlite php7-pdo_mysql\
|
php8-simplexml php8-xmlreader php8-zlib php8-pdo_sqlite php8-pdo_mysql\
|
||||||
php7-pdo_pgsql && \
|
php8-pdo_pgsql && \
|
||||||
rm -rf /var/www/localhost && \
|
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 -p /var/www/app && \
|
||||||
mkdir /var/www/.postgresql && \
|
mkdir /var/www/.postgresql && \
|
||||||
FRESHRSS_VERSION="${FRESHRSS_VERSION##v}" && \
|
FRESHRSS_VERSION="${FRESHRSS_VERSION##v}" && \
|
||||||
echo "Installing FreshRSS version '${FRESHRSS_VERSION}' ..." && \
|
echo "Installing FreshRSS version '${FRESHRSS_VERSION}' ..." && \
|
||||||
curl -SsL "https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz" | \
|
curl -SsL "https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz" | \
|
||||||
tar xz -C /var/www/app/ -X /.tarignore --strip-components=1 && \
|
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 && \
|
apk del .build-deps && \
|
||||||
rm -rf /var/cache/apk/* && \
|
rm -rf /var/cache/apk/* && \
|
||||||
rm -rf /tmp/* && \
|
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/soap_cache && \
|
||||||
mkdir -p /var/lib/php/session && \
|
mkdir -p /var/lib/php/session && \
|
||||||
chown -R nginx /var/lib/php && \
|
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/.postgresql && \
|
||||||
chown -R nginx:nginx /var/www/app
|
chown -R nginx:nginx /var/www/app
|
||||||
|
|
||||||
|
|
|
@ -86,12 +86,12 @@ default_charset = "UTF-8"
|
||||||
;input_encoding =
|
;input_encoding =
|
||||||
;output_encoding =
|
;output_encoding =
|
||||||
|
|
||||||
;include_path = ".:/php7/includes"
|
;include_path = ".:/php8/includes"
|
||||||
|
|
||||||
doc_root =
|
doc_root =
|
||||||
user_dir =
|
user_dir =
|
||||||
|
|
||||||
extension_dir = "/usr/lib/php7/modules"
|
extension_dir = "/usr/lib/php8/modules"
|
||||||
;sys_temp_dir = "/tmp"
|
;sys_temp_dir = "/tmp"
|
||||||
enable_dl = Off
|
enable_dl = Off
|
||||||
|
|
||||||
|
@ -250,7 +250,7 @@ pgsql.log_notice = 0
|
||||||
bcmath.scale = 0
|
bcmath.scale = 0
|
||||||
|
|
||||||
[browscap]
|
[browscap]
|
||||||
browscap = /etc/php7/browscap.ini
|
browscap = /etc/php8/browscap.ini
|
||||||
|
|
||||||
[Session]
|
[Session]
|
||||||
session.save_handler = files
|
session.save_handler = files
|
||||||
|
@ -327,7 +327,7 @@ zend.assertions = -1
|
||||||
;exif.decode_jis_intel = JIS
|
;exif.decode_jis_intel = JIS
|
||||||
|
|
||||||
[Tidy]
|
[Tidy]
|
||||||
;tidy.default_config = /usr/local/lib/php7/default.tcfg
|
;tidy.default_config = /usr/local/lib/php8/default.tcfg
|
||||||
tidy.clean_output = Off
|
tidy.clean_output = Off
|
||||||
|
|
||||||
[soap]
|
[soap]
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
. /usr/local/lib/log.sh
|
. /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/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
|
/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"
|
log_info "Start FreshRSS Server\n"
|
||||||
supercronic /etc/crontabs/nginx &
|
supercronic /etc/crontabs/nginx &
|
||||||
php-fpm7 -F &
|
php-fpm8 -F &
|
||||||
exec nginx -g "daemon off;"
|
exec nginx -g "daemon off;"
|
||||||
|
|
Reference in New Issue