diff --git a/Dockerfile b/Dockerfile index ee461e7..4856f2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,6 @@ docker-php-ext-configure opcache && docker-php-ext-install opcache COPY CAS-1.3.8.tgz /root/ RUN pear install /root/CAS-1.3.8.tgz -#COPY supervisor/ /etc/supervisor/ COPY service/ /etc/service/ COPY glpi_init.sh /root/glpi_init.sh COPY glpi.cron /etc/cron.d/glpi @@ -48,5 +47,4 @@ rm -f /var/www/html/* /root/CAS-1.3.8.tgz && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -#ENTRYPOINT ["supervisord", "--nodaemon", "--configuration", "/etc/supervisor/supervisord.conf"] ENTRYPOINT ["/usr/bin/runsvdir", "-P", "/etc/service"] diff --git a/supervisor/conf.d/apache2.conf b/supervisor/conf.d/apache2.conf deleted file mode 100644 index 8acf518..0000000 --- a/supervisor/conf.d/apache2.conf +++ /dev/null @@ -1,7 +0,0 @@ -[program:apache2] -command = apache2-foreground -autostart = true -autorestart = true -redirect_stderr = true -stdout_logfile = /dev/stdout -stdout_logfile_maxbytes = 0 diff --git a/supervisor/conf.d/cron.conf b/supervisor/conf.d/cron.conf deleted file mode 100644 index 4b856f6..0000000 --- a/supervisor/conf.d/cron.conf +++ /dev/null @@ -1,7 +0,0 @@ -[program:cron] -command = cron -f -autostart = true -autorestart = true -redirect_stderr = true -stdout_logfile = /dev/stdout -stdout_logfile_maxbytes = 0 diff --git a/supervisor/conf.d/glpi_init.conf b/supervisor/conf.d/glpi_init.conf deleted file mode 100644 index 471d501..0000000 --- a/supervisor/conf.d/glpi_init.conf +++ /dev/null @@ -1,8 +0,0 @@ -[program:glpi_init] -command = /root/glpi_init.sh -startsecs = 0 -autorestart = false -startretries = 1 -redirect_stderr = true -stdout_logfile = /dev/stdout -stdout_logfile_maxbytes = 0 diff --git a/supervisor/supervisord.conf b/supervisor/supervisord.conf deleted file mode 100644 index f33948d..0000000 --- a/supervisor/supervisord.conf +++ /dev/null @@ -1,16 +0,0 @@ -; supervisor config file - -[supervisord] -logfile = /var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log) -pidfile = /var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) -childlogdir = /var/log/supervisor ; ('AUTO' child log dir, default $TEMP) -user = root - -; The [include] section can just contain the "files" setting. This -; setting can list multiple files (separated by whitespace or -; newlines). It can also contain wildcards. The filenames are -; interpreted as relative to this file. Included files *cannot* -; include files themselves. - -[include] -files = /etc/supervisor/conf.d/*.conf