From d2cace4db9b91b4dcc784db75b77dbda884012c0 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 3 Oct 2019 15:20:00 +0200 Subject: [PATCH] remove symlink and use sed as workaround --- CHANGELOG.md | 2 +- Dockerfile.linux.amd64 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aeacbd2..b441d03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,4 +3,4 @@ * add env variable for custom DB port * BUGFIX - * symling `/etc/ssl/certs/ca-certificates.crt` to freshrss root as workaround for [#2549](https://github.com/FreshRSS/FreshRSS/issues/2549) + * use sed to add `/etc/ssl/certs/ca-certificates.crt` to freshrss as workaround for [#2549](https://github.com/FreshRSS/FreshRSS/issues/2549) diff --git a/Dockerfile.linux.amd64 b/Dockerfile.linux.amd64 index b0b0c22..061b270 100644 --- a/Dockerfile.linux.amd64 +++ b/Dockerfile.linux.amd64 @@ -9,7 +9,7 @@ LABEL maintainer="Robert Kaussow " \ 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 && \ +RUN apk --update add --virtual .build-deps tar curl sed && \ 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\ @@ -19,11 +19,11 @@ RUN apk --update add --virtual .build-deps tar curl && \ mkdir -p /var/www/app && \ 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/* && \ rm -rf /var/www/app/CHANGELOG.md /var/www/app/CONTRIBUTING.md /var/www/app/CREDITS.md /var/www/app/Docker /var/www/app/README.* && \ - ln -s /etc/ssl/certs/ca-certificates.crt /var/www/app && \ mkdir -p /var/run/php && \ chown -R nginx /var/run/php && \ mkdir -p /var/lib/php/tmp_upload && \