diff --git a/docker/run/fs/etc/supervisor/conf.d/supervisord.conf b/docker/run/fs/etc/supervisor/conf.d/supervisord.conf index 63553ddbc..f0ece47f8 100644 --- a/docker/run/fs/etc/supervisor/conf.d/supervisord.conf +++ b/docker/run/fs/etc/supervisor/conf.d/supervisord.conf @@ -1,22 +1,3 @@ -[supervisord] -nodaemon=true -user=root -logfile=/dev/stdout -logfile_maxbytes=0 -pidfile=/var/run/supervisord.pid -exitcodes=0,2 -directory=/ - -[unix_http_server] -file=/var/run/supervisor.sock -chmod=0777 - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl=unix:///var/run/supervisor.sock - [program:run_sshd] command=/usr/sbin/sshd -D environment= diff --git a/docker/run/fs/etc/supervisor/supervisord.conf b/docker/run/fs/etc/supervisor/supervisord.conf new file mode 100644 index 000000000..7808a31cf --- /dev/null +++ b/docker/run/fs/etc/supervisor/supervisord.conf @@ -0,0 +1,21 @@ +[supervisord] +nodaemon=true +user=root +logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/var/run/supervisord.pid +exitcodes=0,2 +directory=/ + +[unix_http_server] +file=/var/run/supervisor.sock +chmod=0777 + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[supervisorctl] +serverurl=unix:///var/run/supervisor.sock + +[include] +files = /etc/supervisor/conf.d/*.conf \ No newline at end of file diff --git a/docker/run/fs/exe/initialize.sh b/docker/run/fs/exe/initialize.sh index 8c329bb30..cbb41cb57 100644 --- a/docker/run/fs/exe/initialize.sh +++ b/docker/run/fs/exe/initialize.sh @@ -20,4 +20,4 @@ chmod 444 /root/.profile apt-get update > /dev/null 2>&1 & # let supervisord handle the services -exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf