mirror of
https://github.com/invoiceninja/dockerfiles.git
synced 2026-02-03 20:57:12 +01:00
Merge pull request #770 from TheNewSound/debian
Use default supervisord config as baseline
This commit is contained in:
2
debian/Dockerfile
vendored
2
debian/Dockerfile
vendored
@@ -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"]
|
||||||
|
|||||||
2
debian/scripts/init.sh
vendored
2
debian/scripts/init.sh
vendored
@@ -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
|
||||||
|
|||||||
3
debian/supervisor/supervisord.conf
vendored
3
debian/supervisor/supervisord.conf
vendored
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user