wululu_web/invoiceninja-docker
3
0
Fork 0
mirror of https://github.com/invoiceninja/dockerfiles.git synced 2025-12-31 19:47:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #770 from TheNewSound/debian

Browse Source 
Use default supervisord config as baseline
This commit is contained in:
David Bomba
2025-08-12 08:34:16 +10:00
committed by GitHub
parent ed9c23d9c7 68cfe612ee
commit 6a16f6f4de
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/Dockerfile vendored
View File

@@ -41,7 +41,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get install -y --no-install-recommends google-chrome-stable; \ && apt-get install -y --no-install-recommends google-chrome-stable; \
elif [ "$(dpkg --print-architecture)" = "arm64" ]; then \ elif [ "$(dpkg --print-architecture)" = "arm64" ]; then \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
chromium; \ chromium; \
fi \ fi \
# Create config directory for chromium/google-chrome-stable # Create config directory for chromium/google-chrome-stable
&& mkdir /var/www/.config \ && mkdir /var/www/.config \
@@ -82,4 +82,4 @@ HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
CMD pgrep -f "php-fpm: master process" CMD pgrep -f "php-fpm: master process"
ENTRYPOINT ["/usr/local/bin/init.sh"] ENTRYPOINT ["/usr/local/bin/init.sh"]
CMD ["supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"] CMD ["supervisord", "-c", "/etc/supervisor/supervisord.conf"]

4
debian/scripts/init.sh vendored
View File

@@ -7,7 +7,7 @@ elif [ "$(dpkg --print-architecture)" = "arm64" ]; then
export SNAPPDF_CHROMIUM_PATH=/usr/bin/chromium export SNAPPDF_CHROMIUM_PATH=/usr/bin/chromium
fi fi
if [ "$*" = 'supervisord -c /etc/supervisor/conf.d/supervisord.conf' ]; then if [ "$*" = 'supervisord -c /etc/supervisor/supervisord.conf' ]; then
# Check for required folders and create if needed # Check for required folders and create if needed
[ -d /var/www/html/storage/framework/sessions ] || mkdir -p /var/www/html/storage/framework/sessions [ -d /var/www/html/storage/framework/sessions ] || mkdir -p /var/www/html/storage/framework/sessions
@@ -64,4 +64,4 @@ if [ "$*" = 'supervisord -c /etc/supervisor/conf.d/supervisord.conf' ]; then
echo "Starting supervisord..." echo "Starting supervisord..."
fi fi
exec "$@" exec "$@"

3
debian/supervisor/supervisord.conf vendored
View File

@@ -5,9 +5,6 @@ logfile=/dev/null
logfile_maxbytes=0 logfile_maxbytes=0
pidfile=/var/run/supervisord.pid pidfile=/var/run/supervisord.pid
[rpcinterface:supervisor]
supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
[program:php-fpm] [program:php-fpm]
command=/usr/local/sbin/php-fpm -F command=/usr/local/sbin/php-fpm -F
autostart=true autostart=true