blallo/Feedati
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

[TT] dockerfile reorganized; apk upgrade

Browse source
This commit is contained in:
boyska 2018-08-17 15:56:50 +02:00
parent 1b2cc679e3
commit 0f429ac5d6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
docker/Dockerfile-tt-rss
View file

@ -1,5 +1,11 @@
FROM ulsmith/alpine-apache-php7 FROM ulsmith/alpine-apache-php7
RUN apk add --update php7-pgsql php7-fileinfo openrc postgresql-client && apk del php7-pdo_mysql php7-pdo_odbc php7-pdo_sqlite db php7-redis php7-ftp && rm -rf /var/cache/apk/ RUN apk update && apk upgrade && apk add util-linux php7-pgsql php7-fileinfo openrc postgresql-client && apk del php7-pdo_mysql php7-pdo_odbc php7-pdo_sqlite db php7-redis php7-ftp && rm -rf /var/cache/apk/
COPY tt-rss/* /app/public/tt-rss/
COPY docker/ttrss-openrc-apache /etc/init.d/apache
COPY docker/ttrss-openrc-ttrssupdate /etc/init.d/ttrssupdate
COPY docker/ttrss-openrc-ntpd /etc/init.d/ntpd
RUN mkdir -p /app/public/tt-rss/ /var/cache/tt-rss/images \ RUN mkdir -p /app/public/tt-rss/ /var/cache/tt-rss/images \
/var/cache/tt-rss/upload /var/cache/tt-rss/export/ \ /var/cache/tt-rss/upload /var/cache/tt-rss/export/ \
/var/cache/tt-rss/js /var/lock/tt-rss/ && \ /var/cache/tt-rss/js /var/lock/tt-rss/ && \
@ -20,14 +26,8 @@ RUN mkdir -p /app/public/tt-rss/ /var/cache/tt-rss/images \
sed -i '/^ntpd/d' /bootstrap/start.sh &&\ sed -i '/^ntpd/d' /bootstrap/start.sh &&\
echo -e 'log_errors = On\nerror_log = syslog' >> /etc/php7/php.ini &&\ echo -e 'log_errors = On\nerror_log = syslog' >> /etc/php7/php.ini &&\
sed -i -r 's@ErrorLog .*@ErrorLog "|/usr/bin/logger -n syslog -T -P 514 -t apacheErr"@i' /etc/apache2/httpd.conf &&\ sed -i -r 's@ErrorLog .*@ErrorLog "|/usr/bin/logger -n syslog -T -P 514 -t apacheErr"@i' /etc/apache2/httpd.conf &&\
echo 'TransferLog "|/usr/bin/logger -n syslog -T -P 514 -t apacheLog"' >> /etc/apache2/httpd.conf echo 'TransferLog "|/usr/bin/logger -n syslog -T -P 514 -t apacheLog"' >> /etc/apache2/httpd.conf &&\
RUN apk --no-cache add util-linux rc-update add ntpd && rc-update add apache && rc-update add ttrssupdate
COPY tt-rss/* /app/public/tt-rss/
COPY docker/ttrss-openrc-apache /etc/init.d/apache
COPY docker/ttrss-openrc-ttrssupdate /etc/init.d/ttrssupdate
COPY docker/ttrss-openrc-ntpd /etc/init.d/ntpd
RUN rc-update add ntpd && rc-update add apache && rc-update add ttrssupdate
ENTRYPOINT [] ENTRYPOINT []