diff --git a/Dockerfile b/Dockerfile index 91cde11005..23e97f0b36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -234,7 +234,6 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists COPY ./docker/phraseanet/worker/supervisor.conf /etc/supervisor/ - ENTRYPOINT ["docker/phraseanet/worker/entrypoint.sh"] CMD ["/bin/bash", "bin/run-worker.sh"] diff --git a/docker/phraseanet/worker/supervisor_conf.d/assetsIngest.conf b/docker/phraseanet/worker/supervisor_conf.d/assetsIngest.conf index 66e38831a2..a0fc6b4da0 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/assetsIngest.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/assetsIngest.conf @@ -26,4 +26,3 @@ stderr_logfile_backups=10 stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) environment=HOME=/home/app,USER=app ; process environment additions (def no adds) - diff --git a/docker/phraseanet/worker/supervisor_conf.d/createRecord.conf b/docker/phraseanet/worker/supervisor_conf.d/createRecord.conf index ab9343b222..8256627d26 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/createRecord.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/createRecord.conf @@ -26,4 +26,3 @@ stderr_logfile_backups=10 stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) environment=HOME=/home/app,USER=app ; process environment additions (def no adds) - diff --git a/docker/phraseanet/worker/supervisor_conf.d/deleteRecord.conf b/docker/phraseanet/worker/supervisor_conf.d/deleteRecord.conf index 28217fe7f0..3a7d6ff875 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/deleteRecord.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/deleteRecord.conf @@ -26,4 +26,3 @@ stderr_logfile_backups=10 stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) environment=HOME=/var/www,USER=app ; process environment additions (def no adds) - diff --git a/docker/phraseanet/worker/supervisor_conf.d/editRecord.conf b/docker/phraseanet/worker/supervisor_conf.d/editRecord.conf index b506dfee55..4e390c3098 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/editRecord.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/editRecord.conf @@ -26,4 +26,3 @@ stderr_logfile_backups=10 stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) environment=HOME=/home/app,USER=app ; process environment additions (def no adds) - diff --git a/docker/phraseanet/worker/supervisor_conf.d/exportMail.conf b/docker/phraseanet/worker/supervisor_conf.d/exportMail.conf index f6b0b25cc7..29deb36e34 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/exportMail.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/exportMail.conf @@ -25,4 +25,4 @@ stderr_logfile_maxbytes=10MB stderr_logfile_backups=10 ; # of stderr logfile backups (default 10) stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) -environment=HOME=/var/www,USER=app ; process environment additions (def no adds) \ No newline at end of file +environment=HOME=/var/www,USER=app ; process environment additions (def no adds) diff --git a/docker/phraseanet/worker/supervisor_conf.d/ftp.conf b/docker/phraseanet/worker/supervisor_conf.d/ftp.conf index e2633478c0..bcae3243f4 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/ftp.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/ftp.conf @@ -26,4 +26,3 @@ stderr_logfile_backups=10 stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) environment=HOME=/var/www,USER=app ; process environment additions (def no adds) - diff --git a/docker/phraseanet/worker/supervisor_conf.d/mainQueue.conf b/docker/phraseanet/worker/supervisor_conf.d/mainQueue.conf index 16c32f489a..e66a70a857 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/mainQueue.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/mainQueue.conf @@ -25,4 +25,4 @@ stderr_logfile_maxbytes=10MB stderr_logfile_backups=10 ; # of stderr logfile backups (default 10) stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) -environment=HOME=/var/www,USER=www-data ; process environment additions (def no adds) \ No newline at end of file +environment=HOME=/var/www,USER=app ; process environment additions (def no adds) diff --git a/docker/phraseanet/worker/supervisor_conf.d/subdefCreation.conf b/docker/phraseanet/worker/supervisor_conf.d/subdefCreation.conf index 408fa8f0b9..14b87e9e91 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/subdefCreation.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/subdefCreation.conf @@ -25,4 +25,4 @@ stderr_logfile_maxbytes=10MB stderr_logfile_backups=10 ; # of stderr logfile backups (default 10) stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) -environment=HOME=/home/app,USER=app ; process environment additions (def no adds) \ No newline at end of file +environment=HOME=/home/app,USER=app ; process environment additions (def no adds) diff --git a/docker/phraseanet/worker/supervisor_conf.d/validationReminder.conf b/docker/phraseanet/worker/supervisor_conf.d/validationReminder.conf index 33c7e001b1..c82992be1f 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/validationReminder.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/validationReminder.conf @@ -26,4 +26,3 @@ stderr_logfile_backups=10 stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) environment=HOME=/var/www,USER=app ; process environment additions (def no adds) - diff --git a/docker/phraseanet/worker/supervisor_conf.d/webhook.conf b/docker/phraseanet/worker/supervisor_conf.d/webhook.conf index 2a61d06b77..ab01121f8b 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/webhook.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/webhook.conf @@ -25,4 +25,4 @@ stderr_logfile_maxbytes=10MB stderr_logfile_backups=10 ; # of stderr logfile backups (default 10) stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) -environment=HOME=/var/www,USER=app ; process environment additions (def no adds) \ No newline at end of file +environment=HOME=/var/www,USER=app ; process environment additions (def no adds) diff --git a/docker/phraseanet/worker/supervisor_conf.d/writeMetadatas.conf b/docker/phraseanet/worker/supervisor_conf.d/writeMetadatas.conf index c2518fbabc..e160504a78 100644 --- a/docker/phraseanet/worker/supervisor_conf.d/writeMetadatas.conf +++ b/docker/phraseanet/worker/supervisor_conf.d/writeMetadatas.conf @@ -25,4 +25,4 @@ stderr_logfile_maxbytes=10MB stderr_logfile_backups=10 ; # of stderr logfile backups (default 10) stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) stderr_events_enabled=false ; emit events on stderr writes (default false) -environment=HOME=/home/app,USER=app ; process environment additions (def no adds) \ No newline at end of file +environment=HOME=/home/app,USER=app ; process environment additions (def no adds)