Use supervisord for Nginx+php-fpm

docker/entrypoint.sh

@@ -1,11 +1,5 @@
 #!/bin/bash
 
-cleanup() {
-  set +e
-  echo "Stopping php7.3-fpm service..."
-  sudo service php7.3-fpm stop
-}
-trap cleanup 0
 set -e
 
 if [ "${DB_CONNECTION}" = "sqlite" ]; then
@@ -24,9 +18,6 @@ else
 fi
 ln -sF /2fauth/storage /srv/storage
 
-sudo service php7.3-fpm start
-sudo service php7.3-fpm status
-
 if [ -f /2fauth/installed ]; then
   php artisan migrate
   php artisan config:clear
@@ -40,5 +31,4 @@ else
   echo "do not remove me" > /2fauth/installed
 fi
 
-echo "Nginx listening on :8000"
-nginx
+supervisord

docker/nginx.conf

@@ -1,4 +1,3 @@
-daemon off;
 events {}
 http {
   include mime.types;

docker/supervisord.conf

@@ -0,0 +1,19 @@
+[supervisord]
+nodaemon=true
+pidfile=/run/supervisord.pid
+loglevel=info
+
+[program-default]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=false
+startretries=0
+
+[program:php-fpm]
+command=php-fpm7.3 -F
+
+[program:nginx]
+command=nginx -g 'daemon off;'
+depends_on=php-fpm