diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index 94ea63b0..13d93a67 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -227,15 +227,12 @@ RUN set -ex; \ chown www-data:root -R /usr/src && \ chown www-data:root -R /usr/local/etc/php/conf.d && \ chown www-data:root -R /usr/local/etc/php-fpm.d && \ - chown www-data:root -R /var/log/supervisord/ && \ - chown www-data:root -R /var/run/supervisord/ && \ rm -r /usr/src/nextcloud/apps/updatenotification COPY start.sh / COPY notify.sh / RUN set -ex; \ chmod +x /start.sh && \ - chmod +r /supervisord.conf && \ chmod +x /entrypoint.sh && \ chmod +r /upgrade.exclude && \ chmod +x /cron.sh && \ @@ -253,6 +250,5 @@ RUN echo "root:$(openssl rand -base64 12)" | chpasswd USER root ENTRYPOINT ["/start.sh"] -CMD ["sudo", "-E", "-u", "www-data", "/usr/bin/supervisord", "-c", "/supervisord.conf"] HEALTHCHECK CMD (sudo -u www-data nc -z localhost 9000 && sudo -u www-data nc -z localhost 7867) || exit 1 \ No newline at end of file diff --git a/Containers/nextcloud/supervisord.conf b/Containers/nextcloud/supervisord.conf index f411e59b..e376deaa 100644 --- a/Containers/nextcloud/supervisord.conf +++ b/Containers/nextcloud/supervisord.conf @@ -14,6 +14,7 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 command=php-fpm +user=www-data [program:cron] stdout_logfile=/dev/stdout @@ -21,6 +22,7 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 command=/cron.sh +user=www-data [program:notify-push] stdout_logfile=/dev/stdout @@ -28,6 +30,7 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 command=/var/www/html/custom_apps/notify_push/bin/%(ENV_CPU_ARCH)s/notify_push /var/www/html/config/config.php --port 7867 --redis-url redis://:%(ENV_REDIS_HOST_PASSWORD)s@%(ENV_REDIS_HOST)s +user=www-data [program:activate-collabora] stdout_logfile=/dev/stdout @@ -35,3 +38,4 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 command=/activate-collabora.sh +user=www-data