1
0
mirror of https://github.com/x86dev/docker-ttrss synced 2025-12-11 08:56:01 +00:00

Bugfixes.

This commit is contained in:
x86dev
2015-09-15 21:46:44 +02:00
parent 6c1af3b2a5
commit 64aa4f3e42
6 changed files with 13 additions and 15 deletions

View File

@@ -3,9 +3,7 @@ FROM kdelfour/supervisor-docker
MAINTAINER Andreas Löffler <andy@x86dev.com>
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
nginx git ca-certificates php5-fpm php5-cli php5-curl php5-gd php5-json \
php5-pgsql
# php5-mysql
nginx git ca-certificates php5-fpm php5-cli php5-curl php5-gd php5-json php5-pgsql
# add ttrss as the only Nginx site
ADD ttrss-nginx.conf /etc/nginx/sites-available/ttrss
@@ -31,7 +29,6 @@ ENV DB_USER ttrss
ENV DB_PASS ttrss
# always re-configure database with current ENV when RUNning container, then monitor all services
## @todo pack the scripts to a .zip, ADD this and RUN it in setup.sh. Later.
RUN mkdir -p /srv
ADD ttrss-utils.php /srv/ttrss-utils.php
ADD ttrss-configure-db.php /srv/ttrss-configure-db.php
@@ -42,13 +39,10 @@ ADD setup-ttrss.sh /srv/setup-ttrss.sh
ADD update-ttrss.sh /srv/update-ttrss.sh
ADD start-ttrss.sh /srv/start-ttrss.sh
# add updater script for rolling release model -- currently runs on a daily basis
RUN ln -s /srv/update-ttrss.sh /etc/cron.daily/update-ttrss.sh
RUN service cron restart
RUN mkdir -p /etc/supervisor/conf.d
ADD service-nginx.conf /etc/supervisor/conf.d/nginx.conf
ADD service-php5-fpm.conf /etc/supervisor/conf.d/php5.conf
ADD service-ttrss-daemon.conf /etc/supervisor/conf.d/ttrss-daemon.conf
ADD service-ttrss-update.conf /etc/supervisor/conf.d/ttrss-update.conf
# only run the setup once