- Patch PHPPGAdmin to fully support reverse proxy (display.php).

- Variabilization of external server ports in env & compose file,
- Now use docker_tools for .env building.

Dockerfile

@@ -3,7 +3,7 @@
 
 ARG IMG_URL_PREFIX="rx3"
 
-FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.2
+FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.3
 
 ARG IMG_NAME
 ARG IMG_FULL_NAME
@@ -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

@@ -5,7 +5,7 @@ Welcome to Rx3/Tools-Mga9 docker image!
 This is project aims to build Mageia 9 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/php-apache-mga9:1.3.3 image,
     - PHPPGAdmin (Mentax GitHub 2024/07 commit) installed,
     - PostgreSQL server name, host & port configurable.
 

ReleaseNotes.txt

@@ -1,7 +1,25 @@
+------------------------------------------------------------------------------------------------------------------------------------
+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,11 +1,11 @@
-# Rx3 PHP Apache Mageia-9 Docker Image
+# Rx3 Tools Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
 name: ${IMG_NAME}
 
 services:
 
-  webapp:
+  webtools:
     container_name: ${IMG_NAME}
     
     image: ${IMG_URL}
@@ -23,6 +23,7 @@ services:
     restart: unless-stopped
     
     environment:
+      APACHE_DOC_ROOT:                  ${APACHE_DOC_ROOT}
       POSTGRESQL_SERVER_NAME:           ${POSTGRESQL_SERVER_NAME}
       POSTGRESQL_HOST:                  ${POSTGRESQL_HOST}
       POSTGRESQL_PORT:                  ${POSTGRESQL_PORT}
@@ -33,5 +34,5 @@ services:
     network_mode: bridge
     
     ports:
-      - "127.0.0.1:9070:9001"
+      - "127.0.0.1:${WEBAPP_SV_PORT}:9001"
-      - "127.0.0.1:8070:80"
+      - "127.0.0.1:${WEBAPP_PORT}:80"

env

@@ -18,7 +18,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
 
 IMG_NAME="tools-mga9"
 IMG_FULL_NAME="Rx3 Tools Mageia-9 Docker Image"
-IMG_VERSION="1.0.0"
+IMG_VERSION="1.0.2"
 IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
@@ -28,6 +28,12 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 # User Settings
 #-------------------------------------------------------------------------------
 
+ENV_PORT_OFFSET=0
+SV_PORT_OFFSET=1000
+
+WEBAPP_PORT=$(( 8070 + ${ENV_PORT_OFFSET}))
+WEBAPP_SV_PORT=$(( ${WEBAPP_PORT} + ${SV_PORT_OFFSET}))
+
 APACHE_UID=980
 APACHE_GID=977
 APACHE_DOC_ROOT=/var/www/html