address PR feedback

* follow Docker guidelines for supervisord logging
* move healthcheck to Dockerfile from compose file

Author: anarchivist

Dockerfile

@@ -163,6 +163,10 @@ RUN apt-get remove -y zip
 
 USER $APP_USER
 
+# =============================================================================
+# Healthcheck
+HEALTHCHECK --interval=5s --timeout=5s --start-period=10s --retries=10 CMD curl -s http://localhost:8087 > /dev/null || exit 1
+
 # =============================================================================
 # Default command
 

docker-compose.yml

@@ -16,12 +16,7 @@ services:
       - WOWZA_MANAGER_USER=${WOWZA_MANAGER_USER}
       - WOWZA_MANAGER_PASSWORD=${WOWZA_MANAGER_PASSWORD}
       - WOWZA_ENABLE_DOCUMENTATION_SERVER=yes
-    healthcheck:
-      test: curl -s http://localhost:8087 > /dev/null || exit 1
-      interval: 5s
-      timeout: 5s
-      retries: 10
-    # Uncommment these when editing / running tests locally.
+    # Uncomment these when editing / running tests locally.
     # (Note: slows performance on macOS Catalina, for some reason.)
     # volumes:
     #   - ./test:/opt/app/test

supervisor_templates/conf.d/WowzaStreamingEngine.conf.tmpl

@@ -5,7 +5,6 @@ command=/usr/local/WowzaStreamingEngine/bin/startup.sh
 user=${APP_USER}
 autostart=true
 autorestart=true
-stdout_logfile=/dev/stdout
+stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes = 0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes = 0
+redirect_stderr=true

supervisor_templates/conf.d/WowzaStreamingEngineManager.conf.tmpl

@@ -5,7 +5,6 @@ command=/usr/local/WowzaStreamingEngine/manager/bin/startmgr.sh
 user=${APP_USER}
 autostart=true
 autorestart=true
-stdout_logfile=/dev/stdout
+stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes = 0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes = 0
+redirect_stderr=true

supervisor_templates/supervisord.conf.tmpl

@@ -5,7 +5,7 @@ file=${SUPERVISORD_SOCKET_FILE}   ; (the path to the socket file)
 chmod=0700                        ; socket file mode (default 0700)
 
 [supervisord]
-logfile=/dev/stdout               ; send supervisor logs to stdout
+logfile=/dev/null              ; send supervisor logs to stdout
 logfile_maxbytes = 0              ; forcibly disable log rotation
 pidfile=${SUPERVISORD_PID_FILE}   ; (supervisord pidfile;default supervisord.pid)
 childlogdir=/usr/local/supervisor ; ('AUTO' child log dir, default $TEMP)