eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

another attempt

Browse source 
Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2022-10-27 18:23:16 +02:00
parent a03fad2c33
commit a547f1d892
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Containers/nextcloud/Dockerfile
View file

@ -227,15 +227,12 @@ RUN set -ex; \
chown www-data:root -R /usr/src && \ 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/conf.d && \
chown www-data:root -R /usr/local/etc/php-fpm.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 rm -r /usr/src/nextcloud/apps/updatenotification
COPY start.sh / COPY start.sh /
COPY notify.sh / COPY notify.sh /
RUN set -ex; \ RUN set -ex; \
chmod +x /start.sh && \ chmod +x /start.sh && \
chmod +r /supervisord.conf && \
chmod +x /entrypoint.sh && \ chmod +x /entrypoint.sh && \
chmod +r /upgrade.exclude && \ chmod +r /upgrade.exclude && \
chmod +x /cron.sh && \ chmod +x /cron.sh && \
@ -253,6 +250,5 @@ RUN echo "root:$(openssl rand -base64 12)" | chpasswd
USER root USER root
ENTRYPOINT ["/start.sh"] 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 HEALTHCHECK CMD (sudo -u www-data nc -z localhost 9000 && sudo -u www-data nc -z localhost 7867) || exit 1

4
Containers/nextcloud/supervisord.conf
View file

@ -14,6 +14,7 @@ stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
command=php-fpm command=php-fpm
user=www-data
[program:cron] [program:cron]
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
@ -21,6 +22,7 @@ stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
command=/cron.sh command=/cron.sh
user=www-data
[program:notify-push] [program:notify-push]
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
@ -28,6 +30,7 @@ stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 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 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] [program:activate-collabora]
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
@ -35,3 +38,4 @@ stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
command=/activate-collabora.sh command=/activate-collabora.sh
user=www-data