- Add /var/log/init, /var/log/supervisor & var/log/httpd volumes.

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

.env

@@ -1,41 +0,0 @@
-# Rx3 Tools Mageia-9 Docker Image
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# Global Settings
-#-------------------------------------------------------------------------------
-
-IMG_ORG="rx3"
-IMG_REGISTRY="docker.xor.rx3:5000"
-IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
-
-
-
-#-------------------------------------------------------------------------------
-# Image Settings
-#-------------------------------------------------------------------------------
-
-
-IMG_NAME="tools-mga9"
-IMG_FULL_NAME="Rx3 Tools Mageia-9 Docker Image"
-IMG_VERSION="1.0.0"
-IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
-IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
-
-
-
-#-------------------------------------------------------------------------------
-# User Settings
-#-------------------------------------------------------------------------------
-
-APACHE_UID=980
-APACHE_GID=977
-APACHE_DOC_ROOT=/var/www/html
-
-POSTGRESQL_SERVER_NAME=""
-POSTGRESQL_HOST=""
-POSTGRESQL_PORT=""
-
-MARIADB_SERVER_NAME=""
-MARIADB_HOST=""
-MARIADB_PORT=""

Dockerfile

@@ -1,18 +1,18 @@
-# Rx3 PHP Apache Mageia-9 Docker Image
+# Rx3-Docker/Tools Docker Image
 #-------------------------------------------------------------------------------
 
-ARG IMG_URL_PREFIX="rx3"
+ARG IMG_FROM_URL="rx3-docker/php-apache:latest"
 
-FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.2
+FROM ${IMG_FROM_URL}
 
 ARG IMG_NAME
-ARG IMG_FULL_NAME
+ARG IMG_NAME_FULL
 ARG IMG_VERSION
 ARG IMG_MAINTAINER
 
 ARG APACHE_DOC_ROOT
 
-LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
+LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
 LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
 LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
@@ -33,11 +33,12 @@ sed -i "s/$conf\[`extra_login_security`\] = true;/$conf\[`extra_login_security`\
 
 
 
-RUN urpmi --force wget                                                                                                                       \
+RUN urpmi --force wget                                                                                                                                                     \
-    && mkdir -p /var/www/appl                                                                                                                \
+    && mkdir -p /var/www/appl                                                                                                                                              \
-    && wget -q -O- "https://github.com/${PHPPGADMIN_OWNER}/phppgadmin/archive/${PHPPGADMIN_COMMIT}.tar.gz" | tar xzf - -C ${APACHE_DOC_ROOT} \
+    && wget -q -O- "https://github.com/${PHPPGADMIN_OWNER}/phppgadmin/archive/${PHPPGADMIN_COMMIT}.tar.gz" | tar xzf - -C ${APACHE_DOC_ROOT}                               \
-    && mv         ${APACHE_DOC_ROOT}/phppgadmin-${PHPPGADMIN_COMMIT} ${APACHE_DOC_ROOT}/phppgadmin                                           \
+    && mv         ${APACHE_DOC_ROOT}/phppgadmin-${PHPPGADMIN_COMMIT} ${APACHE_DOC_ROOT}/phppgadmin                                                                         \
-    && cp         ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php-dist ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php                   \
+    && sed  -i 's/$_SERVER\['\''REQUEST_URI'\''\]/preg_replace(\"\/^\\\/phppgadmin\\\/\/", "", $_SERVER['\''REQUEST_URI'\''])/g' ${APACHE_DOC_ROOT}/phppgadmin/display.php \
-    && echo -e   "${TOOLSD}"        | sed -e "s/\`/'/g" -e 's/ *$//'                                                    > /etc/init.d/toolsd \
+    && cp         ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php-dist ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php                                                 \
-    && chmod a+x /etc/init.d/toolsd                                                                                                          \
+    && echo -e   "${TOOLSD}"        | sed -e "s/\`/'/g" -e 's/ *$//'                                                                                  > /etc/init.d/toolsd \
+    && chmod a+x /etc/init.d/toolsd                                                                                                                                        \
     && ln   -s   /etc/init.d/toolsd /etc/rcD.d/S40toolsd

ReadMe.txt

@@ -1,12 +1,12 @@
-Welcome to Rx3/Tools-Mga9 docker image!
+Welcome to Rx3-Docker/Tools docker image!
 
 
 
-This is project aims to build Mageia 9 docker image embeding some usefull tools to tests other images from Rx3 packaging projects.
+This project aims to build a docker image embeding some usefull tools to tests other images from Rx3 packaging projects.
 
 Features:
-    - Curtently based on rx3/php-apache-mga9:1.3.2 image,
+    - Curtently based on rx3-docker/php-apache:1.4.0-mga9 image,
-    - PHPPGAdmin (Mentax GitHub 2024/07 commit) installed,
+    - PHPPGAdmin (Mentax GitHub 2024/07 commit) installed (URL: http://localhost:xxxx/phppgadmin/),
     - PostgreSQL server name, host & port configurable.
 
 
@@ -16,4 +16,4 @@ Your Rx3 Team.
 
 --
 arnaud@rx3.net
-https://git.rx3.org/gitea/rx3/tools-mga9
+https://git.rx3.org/gitea/rx3-docker/tools

ReleaseNotes.txt

@@ -1,7 +1,37 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Tools V 1.1.0 - A. GIBERT - 2024/11/11
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Move & Rename repo from Rx3/Tools-MGA9 to Rx3-Docker/Tools,
+- New version naming standard,
+- Now use docker_tools for .env building,
+- Use now rx3-docker/server:1.2.0-mga9 image,
+- Add /var/log/init, /var/log/supervisor & var/log/httpd volumes.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Tools-Mga9 V 1.0.2 - A. GIBERT - 2024/10/29
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Patch phppgadmin to fully support reverse proxy (display.php).
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Tools-Mga9 V 1.0.1 - A. GIBERT - 2024/10/07
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Now use rx3/php-apache-mga9:1.3.3 image,
+- Variabilization of external server ports in env & compose file,
+- Now use docker_tools for .env building.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3/Tools-Mga9 V 1.0.0 - A. GIBERT - 2024/09/04
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Initial release,
-- Use based on rx3/php-apache-mga9:1.3.2 image,
+- Based on rx3/php-apache-mga9:1.3.2 image,
 - PHPPGAdmin Installed.

compose.yaml

@@ -1,37 +1,50 @@
-# Rx3 PHP Apache Mageia-9 Docker Image
+# Rx3-Docker/Tools Docker Image
 #-------------------------------------------------------------------------------
 
-name: ${IMG_NAME}
+name:                           ${IMG_NAME}
 
 services:
 
-  webapp:
+  webtools:
-    container_name: ${IMG_NAME}
+    container_name:             ${IMG_NAME}
+    hostname:                   ${IMG_NAME}
     
-    image: ${IMG_URL}
+    image:                       ${IMG_URL}
 
     build:
       context: .
       args:
-        - IMG_NAME=${IMG_NAME}
+        IMG_NAME:               ${IMG_NAME}
-        - IMG_FULL_NAME=${IMG_FULL_NAME}
+        IMG_NAME_FULL:          ${IMG_NAME_FULL}
-        - IMG_VERSION=${IMG_VERSION}
+        IMG_VERSION:            ${IMG_VERSION}
-        - IMG_MAINTAINER=${IMG_MAINTAINER}
+        IMG_MAINTAINER:         ${IMG_MAINTAINER}
-        - IMG_URL_PREFIX=${IMG_URL_PREFIX}
+        IMG_FROM_URL:           ${IMG_FROM_URL}
-        - APACHE_DOC_ROOT=${APACHE_DOC_ROOT}
+        
+        APACHE_DOC_ROOT:        ${WEBTOOLS_DOC_ROOT}
         
     restart: unless-stopped
     
     environment:
-      POSTGRESQL_SERVER_NAME:           ${POSTGRESQL_SERVER_NAME}
+      APACHE_DOC_ROOT:          ${WEBTOOLS_DOC_ROOT}
-      POSTGRESQL_HOST:                  ${POSTGRESQL_HOST}
+      POSTGRESQL_SERVER_NAME:   ${POSTGRESQL_SERVER_NAME}
-      POSTGRESQL_PORT:                  ${POSTGRESQL_PORT}
+      POSTGRESQL_HOST:          ${POSTGRESQL_HOST}
-      MARIADB_SERVER_NAME:              ${MARIADB_SERVER_NAME}
+      POSTGRESQL_PORT:          ${POSTGRESQL_PORT}
-      MARIADB_HOST:                     ${MARIADB_HOST}
+      MARIADB_SERVER_NAME:      ${MARIADB_SERVER_NAME}
-      MARIADB_PORT:                     ${MARIADB_PORT}
+      MARIADB_HOST:             ${MARIADB_HOST}
-      
+      MARIADB_PORT:             ${MARIADB_PORT}
-    network_mode: bridge
     
+    healthcheck:
+        test: ["CMD", "curl", "-f", "http://localhost:${WEBTOOLS_PORT_MAIN_INT}"]
+        interval:               10s
+        timeout:                3s
+        retries:                3
+      
+    volumes:
+#      - ./var/www/html:${WEBTOOLS_DOC_ROOT}
+      - ./var/log/init:${WEBTOOLS_LOG_INIT_DIR}
+      - ./var/log/supervisor:${WEBTOOLS_LOG_SV_DIR}
+      - ./var/log/httpd:${WEBTOOLS_LOG_HTTPD_DIR}
+
     ports:
-      - "127.0.0.1:9070:9001"
+      - "127.0.0.1:${WEBTOOLS_PORT_SV_EXT}:${WEBTOOLS_PORT_SV_INT}"
-      - "127.0.0.1:8070:80"
+      - "127.0.0.1:${WEBTOOLS_PORT_MAIN_EXT}:${WEBTOOLS_PORT_MAIN_INT}"

env.dist

@@ -0,0 +1,60 @@
+# Rx3-Docker/Tools Docker Image
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Global Settings
+#-------------------------------------------------------------------------------
+
+ORG_NAME="rx3-docker"
+ORG_REGISTRY="docker.xor.rx3:5000"
+
+ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
+
+
+
+#-------------------------------------------------------------------------------
+# Image Settings
+#-------------------------------------------------------------------------------
+
+
+IMG_NAME="tools"
+IMG_NAME_FULL="Rx3-Docker/Tools Docker Image"
+IMG_VERSION="1.1.0-mga9"
+IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
+
+IMG_URL_PREFIX="${ORG_URL_PREFIX}"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
+
+IMG_FROM_URL="${ORG_URL_PREFIX}/php-apache:1.4.0-mga9"
+
+
+
+#-------------------------------------------------------------------------------
+# User Settings
+#-------------------------------------------------------------------------------
+
+ENV_PORT_OFFSET=0
+SV_PORT_OFFSET=1000
+
+WEBTOOLS_PORT_MAIN_EXT=$(( 8070 + ${ENV_PORT_OFFSET}))
+WEBTOOLS_PORT_MAIN_INT=80
+
+WEBTOOLS_PORT_SV_EXT=$(( ${WEBTOOLS_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
+WEBTOOLS_PORT_SV_INT=9001
+
+WEBTOOLS_LOG_INIT_DIR="/var/log/init"
+WEBTOOLS_LOG_SV_DIR="/var/log/supervisor"
+WEBTOOLS_LOG_HTTPD_DIR="/var/log/httpd"
+
+WEBTOOLS_DOC_ROOT="/var/www/html"
+
+APACHE_UID=980
+APACHE_GID=977
+
+POSTGRESQL_SERVER_NAME="Default"
+POSTGRESQL_HOST="127.0.0.1"
+POSTGRESQL_PORT="5342"
+
+MARIADB_SERVER_NAME="Default"
+MARIADB_HOST="127.0.0.1"
+MARIADB_PORT="3306"

var/log/httpd/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/init/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/supervisor/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore