Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
Renovator Bot | 05456914b6 | |
Robert Kaussow | 6c0ec6e6ec | |
Renovator Bot | 8ae6d67686 |
16
Dockerfile
16
Dockerfile
|
@ -1,4 +1,4 @@
|
|||
FROM thegeeklab/nginx:latest@sha256:e45e113a751b6e8738fb5668a91a7eeefe4bdaf16fb2f1df602bfe1fc9e90e46
|
||||
FROM thegeeklab/nginx:latest@sha256:1b4a55c078486ffab6b8bb96def236b47f07574f5966cedcf9ce68de0d529fe8
|
||||
|
||||
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.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
|
||||
|
||||
|
|
|
@ -48,7 +48,6 @@ FRESHRSS_BASE_URL="http://localhost/"
|
|||
FRESHRSS_LANGUAGE="en"
|
||||
FRESHRSS_TITLE="FreshRSS"
|
||||
FRESHRSS_META_DESCRIPTION=
|
||||
FRESHRSS_DEFAULT_USER="_"
|
||||
FRESHRSS_ALLOW_ANONYMOUS="false"
|
||||
FRESHRSS_ALLOW_ANONYMOUS_REFRESH="false"
|
||||
FRESHRSS_AUTH_TYPE="form"
|
||||
|
@ -80,6 +79,8 @@ FRESHRSS_DB_BASE=
|
|||
FRESHRSS_DB_PREFIX="freshrss_"
|
||||
## comma-seperated string, extensions must be installed!
|
||||
FRESHRSS_EXTENSIONS_ENABLED="Tumblr-GDPR"
|
||||
## comma-seperated string
|
||||
FRESHRSS_TRUSTED_SOURCES=127.0.0.0/8,::1/128
|
||||
```
|
||||
|
||||
### PHP
|
||||
|
|
|
@ -7,7 +7,7 @@ return array(
|
|||
'language' => '{{ getenv "FRESHRSS_LANGUAGE" "en" }}',
|
||||
'title' => '{{ getenv "FRESHRSS_TITLE" "FreshRSS" }}',
|
||||
'meta_description' => '{{ getenv "FRESHRSS_META_DESCRIPTION" }}',
|
||||
'default_user' => '{{ getenv "FRESHRSS_DEFAULT_USER" "_" }}',
|
||||
'default_user' => '{{ getenv "FRESHRSS_DEFAULT_USER" "admin" }}',
|
||||
'allow_anonymous' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS" "false" }},
|
||||
'allow_anonymous_refresh' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS_REFRESH" "false" }},
|
||||
'auth_type' => '{{ getenv "FRESHRSS_AUTH_TYPE" "form" }}',
|
||||
|
@ -71,4 +71,10 @@ return array(
|
|||
),
|
||||
|
||||
'disable_update' => true,
|
||||
|
||||
'trusted_sources' => [
|
||||
{{- range (getenv "FRESHRSS_TRUSTED_SOURCES" "127.0.0.0/8,::1/128" | strings.Split ",") }}
|
||||
'{{ . | strings.TrimSpace }}',
|
||||
{{- end }}
|
||||
]
|
||||
);
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -3,8 +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 /var/www/app/data/config.php -f /etc/templates/config.php.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
|
||||
|
@ -35,27 +34,27 @@ else
|
|||
exit $EXITCODE
|
||||
fi
|
||||
|
||||
if [ "${FRESHRSS_DEFAULT_USER}" ]; then
|
||||
log_info "Ensure default user exists"
|
||||
ERROR=$(/usr/bin/php ./cli/create-user.php \
|
||||
--user "$FRESHRSS_DEFAULT_USER" \
|
||||
--password "$FRESHRSS_DEFAULT_PASSWORD" \
|
||||
--language "${FRESHRSS_LANGUAGE:-en}" \
|
||||
2>&1)
|
||||
EXITCODE=$?
|
||||
log_info "Ensure default user exists"
|
||||
ERROR=$(/usr/bin/php ./cli/create-user.php \
|
||||
--user "${FRESHRSS_DEFAULT_USER:-admin}" \
|
||||
--password "${FRESHRSS_DEFAULT_PASSWORD:-freshrss}" \
|
||||
--language "${FRESHRSS_LANGUAGE:-en}" \
|
||||
2>&1)
|
||||
EXITCODE=$?
|
||||
|
||||
if [ $EXITCODE -eq 3 ]; then
|
||||
log_info "FreshRSS user already exists, skipped"
|
||||
elif [ $EXITCODE -eq 0 ]; then
|
||||
log_info "FreshRSS user successfully created"
|
||||
./cli/list-users.php | xargs -n1 ./cli/actualize-user.php --user "$FRESHRSS_DEFAULT_USER"
|
||||
else
|
||||
log_error "FreshRSS error during the creation of a user: ${ERROR}"
|
||||
exit $EXITCODE
|
||||
fi
|
||||
if [ $EXITCODE -eq 3 ]; then
|
||||
log_info "FreshRSS user already exists, skipped"
|
||||
elif [ $EXITCODE -eq 0 ]; then
|
||||
log_info "FreshRSS user successfully created"
|
||||
./cli/list-users.php | xargs -n1 ./cli/actualize-user.php --user "${FRESHRSS_DEFAULT_USER:-admin}"
|
||||
else
|
||||
log_error "FreshRSS error during the creation of a user: ${ERROR}"
|
||||
exit $EXITCODE
|
||||
fi
|
||||
|
||||
/usr/local/bin/gomplate -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl
|
||||
|
||||
log_info "Start FreshRSS Server\n"
|
||||
supercronic /etc/crontabs/nginx &
|
||||
php-fpm8 -F &
|
||||
php-fpm81 -F &
|
||||
exec nginx -g "daemon off;"
|
||||
|
|
Reference in New Issue