From bef7237e3cad92c14740722307c963cac393d36d Mon Sep 17 00:00:00 2001 From: Mathieu Bruyen Date: Sat, 15 Dec 2018 10:20:17 +0100 Subject: [PATCH] supervisor based runner --- Dockerfile | 3 ++- supervisor.conf | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 supervisor.conf diff --git a/Dockerfile b/Dockerfile index 3fa827f..0515ce9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,7 @@ EXPOSE 80 443 COPY nginx.conf /etc/nginx/conf.d/default.conf COPY php-fpm.conf /etc/php7/php-fpm.d/ttrss.conf COPY install-db.php /var/lib/tt-rss-install/install-db.php +COPY supervisor.conf /var/lib/tt-rss-install/supervisor.conf ADD https://git.tt-rss.org/fox/tt-rss/archive/18.12.tar.gz /tmp/ttrss.tar.gz RUN tar -xzf /tmp/ttrss.tar.gz -C /var/lib @@ -39,4 +40,4 @@ RUN \ chmod -R 777 /var/lib/tt-rss/feed-icons && \ chmod -R 777 /var/lib/tt-rss/lock -CMD php-fpm7 && nginx -g "daemon off;" +CMD supervisord -c /var/lib/tt-rss-install/supervisor.conf diff --git a/supervisor.conf b/supervisor.conf new file mode 100644 index 0000000..f1f876f --- /dev/null +++ b/supervisor.conf @@ -0,0 +1,23 @@ +[supervisord] +nodaemon=true + +[program:nginx] +command=nginx -g "daemon off;" +autostart=true +autorestart=true +stdout_events_enabled=true +stderr_events_enabled=true + +[program:php-fpm] +command=php-fpm7 +autostart=true +autorestart=true +stdout_events_enabled=true +stderr_events_enabled=true + +[program:feed-update] +command=php7 /var/lib/tt-rss/update.php --daemon +autostart=true +autorestart=true +stdout_events_enabled=true +stderr_events_enabled=true