- Remove stupid /var/log/README broken link.

- Rebuild for updates.

Dockerfile

@@ -21,12 +21,19 @@ ARG APACHE_PORT
 
 
 
-#---------------------------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------------------------------------------
 ARG HTTPD='#!/bin/bash                                                                                                    \n\
                                                                                                                           \n\
 usermod  -u ${APACHE_UID} apache                                                                                          \n\
 groupmod -g ${APACHE_GID} apache                                                                                          \n\
                                                                                                                           \n\
+chgrp           apache /usr/bin/pwauth                                                                                    \n\
+chmod    u+s           /usr/bin/pwauth                                                                                    \n\
+                                                                                                                          \n\
+if [[ "${APACHE_HTTPD_ENABLED}" == "FALSE" ]]                                                                             \n\
+then                                                                                                                      \n\
+    mv /etc/supervisord.d/httpd.ini /etc/supervisord.d/httpd.ini.disabled                                                 \n\
+else                                                                                                                      \n\
     chown -R apache:apache /var/log/httpd                                                                                 \n\
                                                                                                                           \n\
     for file in /etc/httpd/conf/httpd.conf /etc/httpd/conf/conf.d/rx3.conf                                                \n\
@@ -34,43 +41,54 @@ do
         sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" ${file}                                                           \n\
     done                                                                                                                  \n\
                                                                                                                           \n\
-chgrp           apache /usr/bin/pwauth                                                           \n\
-chmod    u+s           /usr/bin/pwauth'
-#---------------------------------------------------------------------------------------------------
+    if [[ "${PHP_MEMORY_LIMIT}" == "" ]]                                                                                  \n\
+    then                                                                                                                  \n\
+        PHP_MEMORY_LIMIT="512M"                                                                                           \n\
+    fi                                                                                                                    \n\
+                                                                                                                          \n\
+    if [[ "${PHP_UPLOAD_LIMIT}" == "" ]]                                                                                  \n\
+    then                                                                                                                  \n\
+        PHP_UPLOAD_LIMIT="32M"                                                                                            \n\
+    fi                                                                                                                    \n\
+                                                                                                                          \n\
+    sed  -i -e "s/memory_limit = 128M/memory_limit = ${PHP_MEMORY_LIMIT}/"              /etc/php.d/01_ressourcelimits.ini \n\
+    sed  -i -e "s/upload_max_filesize = 16M/upload_max_filesize = ${PHP_UPLOAD_LIMIT}/" /etc/php.d/01_fileuploads.ini     \n\
+    sed  -i -e "s/post_max_size = 8M/post_max_size = ${PHP_UPLOAD_LIMIT}/"              /etc/php.d/01_datahandling.ini    \n\
+fi'
+#----------------------------------------------------------------------------------------------------------------------------
 
-#---------------------------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------------------------------------------
 ARG HTTPD_INI='[program:httpd]                                                                                            \n\
 command=/usr/sbin/httpd -DFOREGROUND'
-#---------------------------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------------------------------------------
 
-#---------------------------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------------------------------------------
 ARG HTTPD_CONF='RewriteEngine On                                                                                          \n\
 <Directory /var/www/html>                                                                                                 \n\
     Options Includes Indexes FollowSymLinks                                                                               \n\
     AllowOverride All                                                                                                     \n\
     Require all granted                                                                                                   \n\
 </Directory>'
-#---------------------------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------------------------------------------
 
-#---------------------------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------------------------------------------
 ARG INFO_PHP='<?php                                                                                                       \n\
     phpinfo();                                                                                                            \n\
     phpinfo( INFO_MODULES);                                                                                               \n\
 ?>'
-#---------------------------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------------------------------------------
 
 
 
-RUN    urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer pwauth \
+RUN    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 \
+    && rm   -f    /var/log/README                                                                                                                               \
     && echo -e    "${HTTPD}"        | sed -e "s/\`/'/g" -e 's/ *$//'                 > /etc/init.d/httpd                                                        \
     && chmod a+x  /etc/init.d/httpd                                                                                                                             \
     && ln   -s    /etc/init.d/httpd /etc/rcD.d/S30httpd                                                                                                         \
     && echo -e    "${HTTPD_INI}"    | sed -e "s/\`/'/g" -e 's/ *$//'                 > /etc/supervisord.d/httpd.ini                                             \
     && echo -e    "${HTTPD_CONF}"   | sed -e "s/\`/'/g" -e 's/ *$//'                 > /etc/httpd/conf/conf.d/rx3.conf                                          \
-    && echo -e    "${INFO_PHP}"     | sed -e "s/\`/'/g" -e 's/ *$//'                 > /var/www/html/info.php            \
-    && sed  -i -e "s/memory_limit = 128M/memory_limit = 512M/"                         /etc/php.d/01_ressourcelimits.ini \
-    && sed  -i -e "s/upload_max_filesize = 16M/upload_max_filesize = 32M/"             /etc/php.d/01_fileuploads.ini     \
-    && sed  -i -e "s/post_max_size = 8M/post_max_size = 32M/"                          /etc/php.d/01_datahandling.ini
+    && echo -e    "${INFO_PHP}"     | sed -e "s/\`/'/g" -e 's/ *$//'                 > /var/www/html/info.php
 
 
 VOLUME ${APACHE_DOC_ROOT}

ReadMe.txt

@@ -2,14 +2,18 @@ Welcome to Rx3-Docker/PHP-Apache docker image!
 
 
 
-This project aims to build a PHP + Apache docker image used by others Rx3 packaging projects.
+This project aims to build a PHP + Apache docker image used by other Rx3 packaging projects.
 
 Features:
-    - Curtently based on rx3-docker/server:1.2.0-mga9 image,
+    - Curtently based on rx3-docker/server:1.2.6-mga9 image,
     - PostgreSQL & MySQL ready,
     - PHPMailer installed,
     - logrotate configured,
-    - Apache UID, GID & document root directory configurable.
+    - Apache UID, GID & document root directory configurable,
+    - mod_proxy + mod_proxy_html installed,
+    - HTTPD service enabled by default (APACHE_HTTPD_ENABLED),
+    - PHP_MEMORY_LIMIT variable set to 512M by default,
+    - PHP_UPLOAD_LIMIT variable set to 32M by defaylt.
 
 
 Enjoy it!

ReleaseNotes.txt

@@ -1,3 +1,45 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/PHP-Apache V 1.5.4 - A. GIBERT - 2025/09/19
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Use now rx3-docker/server:1.2.6-mga9 image,
+- Rebuild for updates.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/PHP-Apache V 1.5.3 - A. GIBERT - 2025/04/21
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Use now rx3-docker/server:1.2.2-mga9 image.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+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.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/PHP-Apache V 1.5.1 - A. GIBERT - 2024/12/31
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add Apache enabling via APACHE_HTTPD_ENABLED environment variable.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/PHP-Apache V 1.5.0 - A. GIBERT - 2024/12/21
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add apache mod proxy to support reverse proxy configuration.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3-Docker/PHP-Apache V 1.4.0 - A. GIBERT - 2024/11/11
 ------------------------------------------------------------------------------------------------------------------------------------

compose.yaml

@@ -1,48 +1,52 @@
 # Rx3-Docker/PHP-Apache Docker Image
 #-------------------------------------------------------------------------------
 
-name:                           ${IMG_NAME}
+name:                               ${HOST_NAME_PREFIX}
 
 services:
 
-  webapp:
-    container_name:             ${IMG_NAME}
-    hostname:                   ${IMG_NAME}
+#-------------------------------------------------------------------------------
 
-    image:                      ${IMG_URL}
+  webapp:
+    container_name:                 ${WA_HOST_NAME}
+    hostname:                       ${WA_HOST_NAME}
+    
+    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}
+        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:        ${WEBAPP_DOC_ROOT}
-        APACHE_LOG_DIR:         ${WEBAPP_LOG_HTTPD_DIR}
-        APACHE_PORT:            ${WEBAPP_PORT_MAIN_INT}
+        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}
+      APACHE_HTTPD_ENABLED:         ${WA_APACHE_HTTPD_ENABLED}
+      PHP_MEMORY_LIMIT:             ${WA_PHP_MEMORY_LIMIT}
+      PHP_UPLOAD_LIMIT:             ${WA_PHP_UPLOAD_LIMIT}
       
     healthcheck:
-        test: ["CMD", "curl", "-f", "http://localhost:${WEBAPP_PORT_MAIN_INT}"]
+        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}"

env.dist

@@ -5,8 +5,10 @@
 # Global Settings
 #-------------------------------------------------------------------------------
 
+
 ORG_NAME="rx3-docker"
 ORG_REGISTRY="docker.xor.rx3:5000"
+ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
 ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
 
@@ -15,16 +17,28 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
 #-------------------------------------------------------------------------------
 # Image Settings
 #-------------------------------------------------------------------------------
+HOST_NAME_PREFIX=""
 
-IMG_NAME="php-apache"
-IMG_NAME_FULL="Rx3-Docker/PHP-Apache Docker Image"
-IMG_VERSION="1.4.0-mga9"
-IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
+PORT_ENV_OFFSET=0
 
-IMG_URL_PREFIX="${ORG_URL_PREFIX}"
-IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
+PORT_SV_INT=9001
+PORT_SV_OFFSET=1000
 
-IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9"
+DOCKER_TOOLS_DEBUG=FALSE
+DOCKER_TOOLS_VOLUME=SINGLE
+#DOCKER_TOOLS_VOLUME=MIXED
+#DOCKER_TOOLS_VOLUME=MERGED
+#DOCKER_TOOLS_VOLUME=SPLITED
+DOCKER_TOOLS_EXEPTION_LIBS="httpd:/var/www/html"
+
+
+
+#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
+#                  | Variable | Service                  | Target Image                                                                            | From Image                                      | Module                    | Main Port     | Admin Port    | User         | Group        |
+#                  | 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.5.4-mga9        ${ORG_URL_PREFIX}    server          1.2.6-mga9   httpd          -            8080    80      -       -       apache         apache
 
 
 
@@ -32,20 +46,9 @@ IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9"
 # User Settings
 #-------------------------------------------------------------------------------
 
-ENV_PORT_OFFSET=0
-SV_PORT_OFFSET=1000
+SERVER_CROND_ENABLED="FALSE"
 
-WEBAPP_PORT_MAIN_EXT=$(( 8080 + ${ENV_PORT_OFFSET}))
-WEBAPP_PORT_MAIN_INT=80
-
-WEBAPP_PORT_SV_EXT=$(( ${WEBAPP_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
-WEBAPP_PORT_SV_INT=9001
-
-WEBAPP_LOG_INIT_DIR="/var/log/init"
-WEBAPP_LOG_SV_DIR="/var/log/supervisor"
-WEBAPP_LOG_HTTPD_DIR="/var/log/httpd"
-
-WEBAPP_DOC_ROOT="/var/www/html"
-
-APACHE_UID=980
-APACHE_GID=977
+WA_DOC_ROOT="/var/www/html"
+WA_APACHE_HTTPD_ENABLED="TRUE"
+WA_PHP_MEMORY_LIMIT="512M"
+WA_PHP_UPLOAD_LIMIT="32M"