container/freshrss
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 36 Activity

Revert "test patched postgres connection options"

Browse Source 
This reverts commit ce7505de46.
This commit is contained in:
Robert Kaussow 2019-10-05 15:30:54 +02:00
parent b5d9d44305
commit 810781b7d9
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,4 +1,3 @@
* ENHANCEMENT * ENHANCEMENT
* remove stdout redirect for the supercronic main process * remove stdout redirect for the supercronic main process
* remove log redirect from cron scripts * remove log redirect from cron scripts
* add new env variable `FRESHRSS_DB_CONNECTION_URI_PARAMS`

1
Dockerfile.linux.amd64
View File

@ -19,7 +19,6 @@ RUN apk --update add --virtual .build-deps tar curl && \
mkdir -p /var/www/app && \ mkdir -p /var/www/app && \
mkdir /var/www/.postgresql && \ mkdir /var/www/.postgresql && \
curl -SsL ${FRESHRSS_TARBALL} | tar xz -C /var/www/app/ --strip-components=1 && \ 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 && \ curl -SsL -o /etc/php7/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/* && \

1
overlay/etc/templates/config.php.tmpl
View File

@ -60,7 +60,6 @@ return array(
'password' => '{{ getenv "FRESHRSS_DB_PASSWORD" }}', 'password' => '{{ getenv "FRESHRSS_DB_PASSWORD" }}',
'base' => '{{ getenv "FRESHRSS_DB_BASE" }}', 'base' => '{{ getenv "FRESHRSS_DB_BASE" }}',
'prefix' => '{{ getenv "FRESHRSS_DB_PREFIX" "freshrss_" }}', 'prefix' => '{{ getenv "FRESHRSS_DB_PREFIX" "freshrss_" }}',
'connection_uri_params' => '{{ getenv "FRESHRSS_DB_CONNECTION_URI_PARAMS" }}',
'pdo_options' => array(), 'pdo_options' => array(),
), ),

6
overlay/usr/local/bin/entrypoint.sh
View File

@ -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/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 /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" printf "\nPrepare FreshRSS...\n"
PREP=$(/usr/bin/php -f ./cli/prepare.php) PREP=$(/usr/bin/php -f ./cli/prepare.php)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -23,7 +27,7 @@ if [ "${FRESHRSS_DEFAULT_USER}" ]; then
;; ;;
esac esac
fi fi
printf "Result: success\n\n" echo "Result: success"
fi fi
if [ -f "/var/www/app/data/do-install.txt" ]; then if [ -f "/var/www/app/data/do-install.txt" ]; then