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

Merge pull request #3018 from nextcloud/enh/noid/adjust-mastercontainer-cmd

Browse source 
mastercontainer - run supervisord directly and not as cmd option
This commit is contained in:
Simon L 2023-08-09 10:11:39 +02:00 • committed by GitHub
commit b9099d8bf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Containers/mastercontainer/Dockerfile
View file

@ -121,6 +121,5 @@ COPY mastercontainer.conf /etc/apache2/sites-available/mastercontainer.conf
USER root USER root
ENTRYPOINT ["/start.sh"] ENTRYPOINT ["/start.sh"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
HEALTHCHECK CMD /healthcheck.sh HEALTHCHECK CMD /healthcheck.sh

9
Containers/mastercontainer/start.sh
View file

@ -26,6 +26,12 @@ if [ "$EUID" != "0" ]; then
exit 1 exit 1
fi fi
# Check that the CMD is not overwritten nor set
if [ "$*" != "" ]; then
print_red "Docker run command for AIO is incorrect as a CMD option was given which is not expected."
exit 1
fi
# Check if socket is available and readable # Check if socket is available and readable
if ! [ -a "/var/run/docker.sock" ]; then if ! [ -a "/var/run/docker.sock" ]; then
print_red "Docker socket is not available. Cannot continue." print_red "Docker socket is not available. Cannot continue."
@ -310,4 +316,5 @@ caddy fmt --overwrite /Caddyfile
# Fix caddy log # Fix caddy log
chmod 777 /root chmod 777 /root
exec "$@" # Start supervisord
/usr/bin/supervisord -c /supervisord.conf