revert sed postgres fix
This commit is contained in:
parent
d2cace4db9
commit
319958cb59
|
@ -1,6 +1,3 @@
|
|||
* ENHANCEMENT
|
||||
* better error handling in entrypoint script
|
||||
* add env variable for custom DB port
|
||||
|
||||
* BUGFIX
|
||||
* use sed to add `/etc/ssl/certs/ca-certificates.crt` to freshrss as workaround for [#2549](https://github.com/FreshRSS/FreshRSS/issues/2549)
|
||||
|
|
|
@ -9,7 +9,7 @@ LABEL maintainer="Robert Kaussow <mail@geeklabor.de>" \
|
|||
ARG FRESHRSS_VERSION=master
|
||||
ARG FRESHRSS_TARBALL=https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz
|
||||
|
||||
RUN apk --update add --virtual .build-deps tar curl sed && \
|
||||
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\
|
||||
|
@ -17,9 +17,9 @@ RUN apk --update add --virtual .build-deps tar curl sed && \
|
|||
rm -rf /var/www/localhost && \
|
||||
rm -f /etc/php7/php-fpm.d/www.conf && \
|
||||
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 /etc/php7/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \
|
||||
sed -i "/pgsql:host=/s/.$/ . ';sslrootcert=\/etc\/ssl\/certs\/ca-certificates.crt';/" /var/www/app/lib/Minz/ModelPdo.php && \
|
||||
apk del .build-deps && \
|
||||
rm -rf /var/cache/apk/* && \
|
||||
rm -rf /tmp/* && \
|
||||
|
@ -31,6 +31,7 @@ RUN apk --update add --virtual .build-deps tar curl sed && \
|
|||
mkdir -p /var/lib/php/session && \
|
||||
chown -R nginx /var/lib/php && \
|
||||
chown nginx /etc/php7/php.ini && \
|
||||
chown -R nginx:nginx /var/www/.postgresql && \
|
||||
chown -R nginx:nginx /var/www/app
|
||||
|
||||
ADD overlay/ /
|
||||
|
|
|
@ -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}" ]; 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
|
||||
|
|
Reference in New Issue
Block a user