- Add apache mod proxy to support reverse proxy configuration.

compose.yaml

@@ -1,48 +1,49 @@
 # Rx3-Docker/PHP-Apache Docker Image
 #-------------------------------------------------------------------------------
 
-name:                           ${IMG_NAME}
+name:                               ${HOST_NAME_PREFIX}
 
 services:
 
+#-------------------------------------------------------------------------------
+
   webapp:
-    container_name:             ${IMG_NAME}
-    hostname:                   ${IMG_NAME}
+    container_name:                 ${WA_HOST_NAME}
+    hostname:                       ${WA_HOST_NAME}
     
-    image:                      ${IMG_URL}
+    image:                          ${WA_IMG_URL}
 
     build:
-      context:                  .
       args:
-        IMG_NAME:               ${IMG_NAME}
-        IMG_NAME_FULL:          ${IMG_NAME_FULL}
-        IMG_VERSION:            ${IMG_VERSION}
-        IMG_MAINTAINER:         ${IMG_MAINTAINER}
-        IMG_FROM_URL:           ${IMG_FROM_URL}
-        
-        APACHE_DOC_ROOT:        ${WEBAPP_DOC_ROOT}
-        APACHE_LOG_DIR:         ${WEBAPP_LOG_HTTPD_DIR}
-        APACHE_PORT:            ${WEBAPP_PORT_MAIN_INT}
-        
-    restart:                    unless-stopped
+        IMG_NAME:                   ${WA_IMG_URL}
+        IMG_NAME_FULL:              ${WA_IMG_NAME_FULL}
+        IMG_VERSION:                ${WA_IMG_VERSION}
+        IMG_MAINTAINER:             ${WA_IMG_MAINTAINER}
+        IMG_FROM_URL:               ${WA_IMG_FROM_URL}
+
+        APACHE_DOC_ROOT:            ${WA_DOC_ROOT}
+        APACHE_LOG_DIR:             ${WA_LOG_MAIN_INT}
+        APACHE_PORT:                ${WA_PORT_MAIN_INT}
+
+    restart:                        unless-stopped
     
     environment:
-      APACHE_UID:               ${APACHE_UID}
-      APACHE_GID:               ${APACHE_GID}
-      APACHE_DOC_ROOT:          ${WEBAPP_DOC_ROOT}
+      APACHE_UID:                   ${WA_USER_ID}
+      APACHE_GID:                   ${WA_GROUP_ID}
+      APACHE_DOC_ROOT:              ${WA_DOC_ROOT}
       
     healthcheck:
-        test: ["CMD", "curl", "-f", "http://localhost:${WEBAPP_PORT_MAIN_INT}"]
-        interval:               10s
-        timeout:                3s
-        retries:                3
+        test:                       ["CMD", "curl", "-f", "http://localhost:${WA_PORT_MAIN_INT}"]
+        interval:                   10s
+        timeout:                    3s
+        retries:                    3
       
     volumes:
-#      - ./var/www/html:${WEBAPP_DOC_ROOT}
-      - ./var/log/init:${WEBAPP_LOG_INIT_DIR}
-      - ./var/log/supervisor:${WEBAPP_LOG_SV_DIR}
-      - ./var/log/httpd:${WEBAPP_LOG_HTTPD_DIR}
-     
+      - ./${WA_LIB_EXT}:${WA_LIB_INT}
+      - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}
+      - ./${WA_LOG_SV_EXT}:${WA_LOG_SV_INT}
+      - ./${WA_LOG_MAIN_EXT}:${WA_LOG_MAIN_INT}
+      
     ports:
-      - "127.0.0.1:${WEBAPP_PORT_SV_EXT}:${WEBAPP_PORT_SV_INT}"
-      - "127.0.0.1:${WEBAPP_PORT_MAIN_EXT}:${WEBAPP_PORT_MAIN_INT}"
+      - "127.0.0.1:${WA_PORT_SV_EXT}:${WA_PORT_SV_INT}"
+      - "127.0.0.1:${WA_PORT_MAIN_EXT}:${WA_PORT_MAIN_INT}"