diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e4a45e..f009c61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,3 @@ * ENHANCEMENT * remove stdout redirect for the supercronic main process * remove log redirect from cron scripts - * add new env variable `FRESHRSS_DB_CONNECTION_URI_PARAMS` diff --git a/Dockerfile.linux.amd64 b/Dockerfile.linux.amd64 index 78468de..81f4ab3 100644 --- a/Dockerfile.linux.amd64 +++ b/Dockerfile.linux.amd64 @@ -19,7 +19,6 @@ RUN apk --update add --virtual .build-deps tar curl && \ mkdir -p /var/www/app && \ mkdir /var/www/.postgresql && \ curl -SsL ${FRESHRSS_TARBALL} | tar xz -C /var/www/app/ --strip-components=1 && \ - curl -SsL -o /var/www/app/lib/Minz/ModelPdo.php https://raw.githubusercontent.com/FreshRSS/FreshRSS/f1173f96c44e776a44f927933db4e4eb46776bd6/lib/Minz/ModelPdo.php && \ curl -SsL -o /etc/php7/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \ apk del .build-deps && \ rm -rf /var/cache/apk/* && \ diff --git a/overlay/etc/templates/config.php.tmpl b/overlay/etc/templates/config.php.tmpl index f7f8185..5098bd2 100644 --- a/overlay/etc/templates/config.php.tmpl +++ b/overlay/etc/templates/config.php.tmpl @@ -60,7 +60,6 @@ return array( 'password' => '{{ getenv "FRESHRSS_DB_PASSWORD" }}', 'base' => '{{ getenv "FRESHRSS_DB_BASE" }}', 'prefix' => '{{ getenv "FRESHRSS_DB_PREFIX" "freshrss_" }}', - 'connection_uri_params' => '{{ getenv "FRESHRSS_DB_CONNECTION_URI_PARAMS" }}', 'pdo_options' => array(), ), diff --git a/overlay/usr/local/bin/entrypoint.sh b/overlay/usr/local/bin/entrypoint.sh index ecbf613..3b069a4 100755 --- a/overlay/usr/local/bin/entrypoint.sh +++ b/overlay/usr/local/bin/entrypoint.sh @@ -4,6 +4,10 @@ /usr/local/bin/gomplate -V -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl /usr/local/bin/gomplate -V -o /var/www/app/constants.local.php -f /etc/templates/constants.local.php.tmpl +if [ "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" ] && [ ! -f "/var/www/.postgresql/root.crt" ]; then + ln -s "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" /var/www/.postgresql/root.crt +fi + printf "\nPrepare FreshRSS...\n" PREP=$(/usr/bin/php -f ./cli/prepare.php) if [ $? -ne 0 ]; then @@ -23,7 +27,7 @@ if [ "${FRESHRSS_DEFAULT_USER}" ]; then ;; esac fi - printf "Result: success\n\n" + echo "Result: success" fi if [ -f "/var/www/app/data/do-install.txt" ]; then