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

remove symlink and use sed as workaround
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details

This commit is contained in:
Robert Kaussow 2019-10-03 15:20:00 +02:00
parent df4b873e78
commit d2cace4db9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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)

4
Dockerfile.linux.amd64
View File

@ -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 && \
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 && \