make different configurations

Dockerfile

@@ -64,8 +64,11 @@ COPY default.nginx /etc/nginx/sites-available/default
 RUN ln -s /usr/local/share/doc/epple2 /usr/share/nginx/html/epple2
 
 # supervisor
-CMD ["supervisord"]
-COPY supervisord.conf /etc/supervisor/conf.d/
+RUN rm -R /etc/supervisor/*
+ENTRYPOINT ["supervisord"]
+CMD ["-c", "both"]
+COPY supervisor/includes /etc/supervisor/
+COPY supervisor/commands ./
 
 ENV DISPLAY :0
 ENV SDL_VIDEODRIVER x11

supervisor/commands/app

@@ -0,0 +1,5 @@
+[supervisord]
+nodaemon=true
+
+[include]
+files=/etc/supervisor/epple2.supervisor

supervisor/commands/both

@@ -0,0 +1,5 @@
+[supervisord]
+nodaemon=true
+
+[include]
+files=/etc/supervisor/web.supervisor /etc/supervisor/epple2.supervisor

supervisor/commands/web

@@ -0,0 +1,5 @@
+[supervisord]
+nodaemon=true
+
+[include]
+files=/etc/supervisor/web.supervisor

supervisor/includes/epple2.supervisor

@@ -1,6 +1,3 @@
-[supervisord]
-nodaemon=true
-
 [program:Xvfb]
 command=Xvfb -screen 0 640x480x24 -ac
 stdout_logfile=/dev/stdout
@@ -13,12 +10,6 @@ stdout_logfile=/dev/stdout
 redirect_stderr=true
 stdout_logfile_maxbytes=0
 
-[program:nginx]
-command=nginx -g "daemon off;"
-stdout_logfile=/dev/stdout
-redirect_stderr=true
-stdout_logfile_maxbytes=0
-
 [program:epple2]
 command=epple2
 stdout_logfile=/dev/stdout

supervisor/includes/web.supervisor

@@ -0,0 +1,5 @@
+[program:nginx]
+command=nginx -g "daemon off;"
+stdout_logfile=/dev/stdout
+redirect_stderr=true
+stdout_logfile_maxbytes=0