From c92a3fbbca027f3cf1cd916b29ec433c6187d2cb Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Fri, 28 Nov 2025 12:11:43 +0100 Subject: [PATCH] - Switch to new default_vhost.d layout, - Use now rx3-docker/server:1.2.7-mga9 image, - Rebuild for updates. --- Dockerfile | 27 ++++++++++++++++----------- ReadMe.txt | 3 ++- ReleaseNotes.txt | 10 ++++++++++ env.dist | 2 +- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 76021cf..be0bd07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,10 +30,12 @@ groupmod -g ${APACHE_GID} apache chgrp apache /usr/bin/pwauth \n\ chmod u+s /usr/bin/pwauth \n\ \n\ -if [[ "${APACHE_HTTPD_ENABLED}" == "FALSE" ]] \n\ +if [[ "${APACHE_HTTPD_ENABLED}" != "TRUE" ]] \n\ then \n\ - mv /etc/supervisord.d/httpd.ini /etc/supervisord.d/httpd.ini.disabled \n\ + file_enable /etc/supervisord.d/httpd.ini FALSE \n\ else \n\ + file_enable /etc/supervisord.d/httpd.ini TRUE \n\ + \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\ @@ -80,15 +82,18 @@ ARG INFO_PHP=' /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 +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 \ + && 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 \ + && mkdir /etc/httpd/conf/sites.d/default_vhost.d \ + && 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/sites.d/default_vhost.d/50-rx3.conf \ + && echo -e "${INFO_PHP}" | sed -e "s/\`/'/g" -e 's/ *$//' > /var/www/html/info.php VOLUME ${APACHE_DOC_ROOT} diff --git a/ReadMe.txt b/ReadMe.txt index 1661143..68b7d11 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,8 @@ 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.2.6-mga9 image, + - Curtently based on rx3-docker/server:1.2.7-mga9 image, + - default_vhost.d layout support, - PostgreSQL & MySQL ready, - PHPMailer installed, - logrotate configured, diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 774501d..c451c61 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/PHP-Apache V 1.6.0 - A. GIBERT - 2025/11/28 +------------------------------------------------------------------------------------------------------------------------------------ + +- Switch to new default_vhost.d layout, +- Use now rx3-docker/server:1.2.7-mga9 image, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/PHP-Apache V 1.5.4 - A. GIBERT - 2025/09/19 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/env.dist b/env.dist index a82b774..a2a5e07 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.5.4-mga9 ${ORG_URL_PREFIX} server 1.2.6-mga9 httpd - 8080 80 - - apache apache +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