remove supervisor

Dockerfile

@@ -33,7 +33,4 @@ RUN sed -e 's/upload_max_filesize = .*/upload_max_filesize = 8M/' \
         -e 's,;session.save_path.*,session.save_path = "/run/mediawiki/sessions",' \
         -i /etc/php5/apache2/php.ini
 
-# supervisor
-ADD supervisor-apache2.conf /etc/supervisor/conf.d/apache2.conf
-
 CMD [ "/app/code/start.sh" ]

start.sh

@@ -82,5 +82,8 @@ $WP option update wpoa_cloudron_api_secret "${OAUTH_CLIENT_SECRET}"
 
 chown -R www-data:www-data /app/code /app/data
 
-/usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i WordPress
+echo "Starting apache"
+APACHE_CONFDIR="" source /etc/apache2/envvars
+rm -f "${APACHE_PID_FILE}"
+exec /usr/sbin/apache2 -DFOREGROUND
 

supervisor-apache2.conf

@@ -1,10 +0,0 @@
-[program:apache2]
-autorestart=true
-autostart=true
-command=/usr/bin/pidproxy /var/run/apache2/apache2.pid /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2 -DFOREGROUND"
-illasgroup=true
-priority=100
-stdout_logfile=/var/log/supervisor/%(program_name)s.log
-stderr_logfile=/var/log/supervisor/%(program_name)s.log
-stopasgroup=true
-