From 752c89f86397f03ac1e21ac42e4f8fda37d6a75b Mon Sep 17 00:00:00 2001 From: Mathieu Bruyen Date: Sat, 15 Dec 2018 11:34:00 +0100 Subject: [PATCH] dedicated user --- Dockerfile | 3 +++ supervisor.conf | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0ae4a76..c425873 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,4 +41,7 @@ RUN \ chmod -R 777 /var/lib/tt-rss/feed-icons && \ chmod -R 777 /var/lib/tt-rss/lock +RUN adduser -D ttrss +USER ttrss + CMD supervisord -c /var/lib/tt-rss-install/supervisor.conf diff --git a/supervisor.conf b/supervisor.conf index 904d959..e73b724 100644 --- a/supervisor.conf +++ b/supervisor.conf @@ -1,12 +1,10 @@ [supervisord] nodaemon=true -user=nginx logfile=/tmp/supervisord.log pidfile=/tmp/supervisord.pid [program:nginx] command=/usr/sbin/nginx -g "daemon off;" -autostart=true autorestart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 @@ -15,7 +13,6 @@ stderr_logfile_maxbytes=0 [program:php-fpm] command=/usr/sbin/php-fpm7 -F -autostart=true autorestart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 @@ -25,7 +22,6 @@ stderr_logfile_maxbytes=0 [eventlistener:feed-update] command=/usr/bin/php7 -r 'while (true) { print("READY\n"); readline(); passthru("/usr/bin/php7 /var/lib/tt-rss/update.php --daemon-loop"); print("RESULT 2\nOK\n"); }' events=TICK_60 -autostart=true autorestart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 @@ -33,5 +29,5 @@ stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [eventlistener:quit_on_failure] -events=PROCESS_STATE_FATAL command=/usr/bin/python /var/lib/tt-rss-install/manage-supervisord.py +events=PROCESS_STATE_FATAL