Rx3-Docker/php-apache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

- Enable Apache Macro support,

Browse Source 
- Add SupervisorProxy macro,
- Change rx3.conf config priority from 50 to 30.
This commit is contained in:
Arnaud G. GIBERT
2026-02-11 19:25:27 +01:00
parent 8f5a7cc17d
commit 13e032e9e4
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@@ -59,7 +59,19 @@ command=/usr/sbin/httpd -DFOREGROUND'
#---------------------------------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------------------------------
ARG HTTPD_CONF='RewriteEngine On \n\ ARG HTTPD_CONF='<Macro SupervisorProxy $prefix $host $port> \n\
RewriteRule "^/$prefix$" "/$refix/" [R] \n\
\n\
<Location /$prefix/> \n\
ProxyPass http://$host:$port/ \n\
ProxyPassReverse http://$host:$port/ \n\
\n\
Header edit* Location ^(https?://[^/]+)/(?!$prefix/)(.*)$ $1/$prefix/index.html$2 \n\
</Location> \n\
</Macro> \n\
\n\
RewriteEngine On \n\
\n\
<Directory /var/www/html> \n\ <Directory /var/www/html> \n\
Options Includes Indexes FollowSymLinks \n\ Options Includes Indexes FollowSymLinks \n\
AllowOverride All \n\ AllowOverride All \n\
@@ -78,6 +90,7 @@ ARG INFO_PHP='<?php
RUN urpmi.update -a \ 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 \ && 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 \
&& mv /etc/httpd/conf/sites.d/00_default_vhosts.conf /etc/httpd/conf/sites.d/00-default_vhost.conf \ && mv /etc/httpd/conf/sites.d/00_default_vhosts.conf /etc/httpd/conf/sites.d/00-default_vhost.conf \
&& sed -i -e "s%ServerName localhost%ServerName localhost\n\n Include conf/sites.d/default_vhost.d/*.conf%" /etc/httpd/conf/sites.d/00-default_vhost.conf \ && sed -i -e "s%ServerName localhost%ServerName localhost\n\n Include conf/sites.d/default_vhost.d/*.conf%" /etc/httpd/conf/sites.d/00-default_vhost.conf \
&& mkdir /etc/httpd/conf/sites.d/default_vhost.d \ && mkdir /etc/httpd/conf/sites.d/default_vhost.d \
@@ -86,7 +99,7 @@ RUN urpmi.update -a
&& chmod a+x /etc/init.d/httpd \ && chmod a+x /etc/init.d/httpd \
&& ln -s /etc/init.d/httpd /etc/rcD.d/S30httpd \ && 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_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/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 && echo -e "${INFO_PHP}" | sed -e "s/\`/'/g" -e 's/ *$//' > /var/www/html/info.php

1
ReadMe.txt
View File

@@ -12,6 +12,7 @@ Features:
- logrotate configured, - logrotate configured,
- Apache UID, GID & document root directory configurable, - Apache UID, GID & document root directory configurable,
- mod_proxy + mod_proxy_html installed, - mod_proxy + mod_proxy_html installed,
- SupervisorProxy Apache macro,
- HTTPD service enabled by default (APACHE_HTTPD_ENABLED), - HTTPD service enabled by default (APACHE_HTTPD_ENABLED),
- PHP_MEMORY_LIMIT variable set to 512M by default, - PHP_MEMORY_LIMIT variable set to 512M by default,
- PHP_UPLOAD_LIMIT variable set to 32M by defaylt. - PHP_UPLOAD_LIMIT variable set to 32M by defaylt.

10
ReleaseNotes.txt
View File

@@ -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 Rx3-Docker/PHP-Apache V 1.6.0 - A. GIBERT - 2025/12/01
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

2
env.dist
View File

@@ -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 | # | 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