diff --git a/Dockerfile b/Dockerfile index 9fcb9e1..9d6b5bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,19 @@ command=/usr/sbin/httpd -DFOREGROUND' #---------------------------------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------------------------------- -ARG HTTPD_CONF='RewriteEngine On \n\ +ARG HTTPD_CONF=' \n\ + RewriteRule "^/$prefix$" "/$refix/" [R] \n\ + \n\ + \n\ + ProxyPass http://$host:$port/ \n\ + ProxyPassReverse http://$host:$port/ \n\ + \n\ + Header edit* Location ^(https?://[^/]+)/(?!$prefix/)(.*)$ $1/$prefix/index.html$2 \n\ + \n\ + \n\ + \n\ +RewriteEngine On \n\ + \n\ \n\ Options Includes Indexes FollowSymLinks \n\ AllowOverride All \n\ @@ -78,6 +90,7 @@ ARG INFO_PHP=' /etc/supervisord.d/httpd.ini \ - && echo -e "${HTTPD_CONF}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/httpd/conf/sites.d/default_vhost.d/50-rx3.conf \ + && echo -e "${HTTPD_CONF}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/httpd/conf/sites.d/default_vhost.d/30-rx3.conf \ && echo -e "${INFO_PHP}" | sed -e "s/\`/'/g" -e 's/ *$//' > /var/www/html/info.php diff --git a/ReadMe.txt b/ReadMe.txt index 68b7d11..d9c34a3 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -12,6 +12,7 @@ Features: - logrotate configured, - Apache UID, GID & document root directory configurable, - mod_proxy + mod_proxy_html installed, + - SupervisorProxy Apache macro, - 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. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 54e14b7..5036041 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/PHP-Apache V 1.6.1 - A. GIBERT - 2026/02/11 +------------------------------------------------------------------------------------------------------------------------------------ + +- Enable Apache Macro support, +- Add SupervisorProxy macro, +- Change rx3.conf config priority from 50 to 30. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/PHP-Apache V 1.6.0 - A. GIBERT - 2025/12/01 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/env.dist b/env.dist index a2a5e07..48cc3d5 100644 --- a/env.dist +++ b/env.dist @@ -38,7 +38,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.0-mga9 ${ORG_URL_PREFIX} server 1.2.7-mga9 httpd - 8080 80 - - apache apache +docker_service_add WA webapp ${ORG_URL_PREFIX} php-apache "Rx3-Docker/PHP-Apache" 1.6.1-mga9 ${ORG_URL_PREFIX} server 1.2.7-mga9 httpd - 8080 80 - - apache apache