From 5a79b87b016ec0f29b6b861d9559e0e144bcd79f Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Thu, 28 May 2026 20:30:48 +0200
Subject: [PATCH] - Now use rx3-docker/server:1.4.0-mga9 image, - Now use
 docker-tools-1.5.2, - Rebuild for updates.

---
 Dockerfile       |  4 ++--
 ReadMe.txt       |  2 +-
 ReleaseNotes.txt | 24 +++++++++++++++++-------
 env.dist         |  5 +++--
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 47dc050..36af0cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -134,7 +134,7 @@ ARG HTTPD_CONF='#---------------------------------------------------------------
                                                                                                                                                                        \n\
                                                                                                                                                                        \n\
                                                                                                                                                                        \n\
-RewriteEngine On                                                                                                                                                       \n\
+RewriteEngine                      On                                                                                                                                  \n\
                                                                                                                                                                        \n\
 # Reverse Proxy Configuration                                                                                                                                          \n\
 ProxyRequests                      Off                                                                                                                                 \n\
@@ -161,7 +161,7 @@ ARG INFO_PHP='<?php
 
 
 
-RUN    . /etc/profile.d/rx3.sh && isl_add ${IMG_URL}                                                                                                                     \
+RUN    . /etc/profile.d/rx3.sh && isl --add ${IMG_URL}                                                                                                                   \
     && urpmi.update -a                                                                                                                                                   \
     && urpmi --force apache apache-mod_proxy apache-mod_proxy_html apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer pwauth          \
     && sed -i     -e "s%#LoadModule macro_module modules/mod_macro.so%LoadModule macro_module modules/mod_macro.so%"     /etc/httpd/conf/modules.d/00_base.conf          \
diff --git a/ReadMe.txt b/ReadMe.txt
index 2d0eefa..1da939f 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -5,7 +5,7 @@ Welcome to Rx3-Docker/PHP-Apache docker image!
 This project aims to build a PHP + Apache docker image used by other Rx3 packaging projects.
 
 Features:
-    - Curtently based on rx3-docker/server:1.3.0-mga9 image,
+    - Curtently based on rx3-docker/server:1.4.0-mga9 image,
     - default_vhost.d layout support,
     - PostgreSQL & MySQL ready,
     - PHPMailer installed,
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index d1c2fea..6777d99 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,13 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/PHP-Apache V 1.7.0 - A. GIBERT - 2026/05/30
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Now use rx3-docker/server:1.4.0-mga9 image,
+- Now use docker-tools-1.5.2,
+- Rebuild for updates.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3-Docker/PHP-Apache V 1.6.3 - A. GIBERT - 2026/03/01
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -11,7 +21,7 @@ Rx3-Docker/PHP-Apache V 1.6.2 - A. GIBERT - 2026/02/16
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Add ISL support,
-- Use now rx3-docker/server:1.3.0-mga9 image,
+- Now Use rx3-docker/server:1.3.0-mga9 image,
 - Fix rx3.conf file renaming bug.
 - Rebuild for updates.
 
@@ -34,7 +44,7 @@ Rx3-Docker/PHP-Apache V 1.6.0 - A. GIBERT - 2025/12/01
 - Switch to new default_vhost.d layout,
 - Fix error when APACHE_UID / APACHE_GID not provided,
 - Perform HTTPD initialisation even when not activated,
-- Use now rx3-docker/server:1.2.7-mga9 image,
+- Now use rx3-docker/server:1.2.7-mga9 image,
 - Rebuild for updates.
 
 
@@ -43,7 +53,7 @@ Rx3-Docker/PHP-Apache V 1.6.0 - A. GIBERT - 2025/12/01
 Rx3-Docker/PHP-Apache V 1.5.4 - A. GIBERT - 2025/09/19
 ------------------------------------------------------------------------------------------------------------------------------------
 
-- Use now rx3-docker/server:1.2.6-mga9 image,
+- Now use rx3-docker/server:1.2.6-mga9 image,
 - Rebuild for updates.
 
 
@@ -52,7 +62,7 @@ Rx3-Docker/PHP-Apache V 1.5.4 - A. GIBERT - 2025/09/19
 Rx3-Docker/PHP-Apache V 1.5.3 - A. GIBERT - 2025/04/21
 ------------------------------------------------------------------------------------------------------------------------------------
 
-- Use now rx3-docker/server:1.2.2-mga9 image.
+- Now use rx3-docker/server:1.2.2-mga9 image.
 
 
 
@@ -61,7 +71,7 @@ Rx3-Docker/PHP-Apache V 1.5.2 - A. GIBERT - 2025/03/08
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Add PHP_MEMORY_LIMIT & PHP_UPLOAD_LIMIT environment variable,
-- Use now rx3-docker/server:1.2.1-mga9 image.
+- Now use rx3-docker/server:1.2.1-mga9 image.
 
 
 
@@ -88,7 +98,7 @@ Rx3-Docker/PHP-Apache V 1.4.0 - A. GIBERT - 2024/11/11
 - 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,
+- Now use rx3-docker/server:1.2.0-mga9 image,
 - Add /var/log/init, /var/log/supervisor & var/log/httpd volumes.
 
 
@@ -105,7 +115,7 @@ Rx3/PHP-Apache-Mga9 V 1.3.3 - A. GIBERT - 2024/10/05
     - post_max_size from 8M to 32M,
 - Don't expose unneeded /var/www/html in compose file,
 - Variabilization of external server ports in env & compose file,
-- Use now docker_tools for .env building.
+- Now use docker_tools for .env building.
 
 
 
diff --git a/env.dist b/env.dist
index 0bdf384..5cfb66e 100644
--- a/env.dist
+++ b/env.dist
@@ -5,7 +5,6 @@
 # Global Settings
 #-------------------------------------------------------------------------------
 
-
 ORG_NAME="rx3-docker"
 ORG_REGISTRY="docker.xor.rx3:5000"
 ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
@@ -17,6 +16,8 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
 #-------------------------------------------------------------------------------
 # Image Settings
 #-------------------------------------------------------------------------------
+
+APPL_NAME=""
 HOST_NAME_PREFIX=""
 
 PORT_ENV_OFFSET=0
@@ -38,7 +39,7 @@ DOCKER_TOOLS_EXEPTION_LIBS="httpd:/var/www/html"
 #                  | Prefix   | Name                     | URL Prefix         | Name             | Name Full                     | Version         | URL Prefix         | Name          | Version    | Name         | Version    | Ext   | Int   | Ext   | Int   | Name / Id    | Name / Id    |
 #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
 
-docker_service_add   WA         webapp                     ${ORG_URL_PREFIX}    php-apache         "Rx3-Docker/PHP-Apache"         1.6.3-mga9        ${ORG_URL_PREFIX}    server          1.3.0-mga9   httpd          -            8080    80      -       -       apache         apache
+docker_service_add   WA         webapp                     ${ORG_URL_PREFIX}    php-apache         "Rx3-Docker/PHP-Apache"         1.7.0-mga9        ${ORG_URL_PREFIX}    server          1.4.0-mga9   httpd          -            8080    80      -       -       apache         apache