- Move & Rename repo from Rx3/PHP-Apache-MGA9 to Rx3-Docker/PHP-Apache,

- New version naming standard,
- Now use docker_tools for .env building,
- Use now rx3-docker/server:1.2.0-mga9 image.

compose.yaml

@@ -1,36 +1,42 @@
-# Rx3 PHP Apache Mageia-9 Docker Image
+# Rx3-Docker/PHP-Apache Docker Image
 #-------------------------------------------------------------------------------
 
-name: ${IMG_NAME}
+name:                           ${IMG_NAME}
 
 services:
 
   webapp:
-    container_name: ${IMG_NAME}
+    container_name:             ${IMG_NAME}
+    hostname:                   ${IMG_NAME}
     
-    image: ${IMG_URL}
+    image:                      ${IMG_URL}
 
     build:
-      context: .
+      context:                  .
       args:
-        - IMG_NAME=${IMG_NAME}
-        - IMG_FULL_NAME=${IMG_FULL_NAME}
-        - IMG_VERSION=${IMG_VERSION}
-        - IMG_MAINTAINER=${IMG_MAINTAINER}
-        - IMG_URL_PREFIX=${IMG_URL_PREFIX}
+        IMG_NAME:               ${IMG_NAME}
+        IMG_FULL_NAME:          ${IMG_NAME_FULL}
+        IMG_VERSION:            ${IMG_VERSION}
+        IMG_MAINTAINER:         ${IMG_MAINTAINER}
+        IMG_FROM_URL:           ${IMG_FROM_URL}
+        APACHE_PORT:            ${WEBAPP_PORT_MAIN_INT}
         
-    restart: unless-stopped
+    restart:                    unless-stopped
     
     environment:
-      APACHE_UID:      ${APACHE_UID}
-      APACHE_GID:      ${APACHE_GID}
-      APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
+      APACHE_UID:               ${APACHE_UID}
+      APACHE_GID:               ${APACHE_GID}
+      APACHE_DOC_ROOT:          ${APACHE_DOC_ROOT}
+      
+    healthcheck:
+        test: ["CMD", "curl", "-f", "http://localhost:${WEBAPP_PORT_MAIN_INT}"]
+        interval:               10s
+        timeout:                3s
+        retries:                3
       
 #    volumes:
 #      - ./var/www/html:/var/www/html
       
-    network_mode: bridge
-    
     ports:
-      - "127.0.0.1:${WEBAPP_SV_PORT}:9001"
-      - "127.0.0.1:${WEBAPP_PORT}:80"
+      - "127.0.0.1:${WEBAPP_PORT_SV_EXT}:${WEBAPP_PORT_SV_INT}"
+      - "127.0.0.1:${WEBAPP_PORT_MAIN_EXT}:${WEBAPP_PORT_MAIN_INT}"