From c5e1371b51b4de6d3d02bc6bd37cc9e7f345436c Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sun, 15 Feb 2026 23:57:02 +0100 Subject: [PATCH] - Fix rx3.conf file renaming bug. --- Dockerfile | 6 ++++-- ReleaseNotes.txt | 8 ++++++++ env.dist | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index edd68fb..70f4a79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,8 @@ ARG APACHE_DOC_ROOT ARG APACHE_LOG_DIR ARG APACHE_PORT +ARG HTTPD_CONF_FILE=/etc/httpd/conf/sites.d/default_vhost.d/30-rx3.conf + #---------------------------------------------------------------------------------------------------------------------------- @@ -33,7 +35,7 @@ chmod u+s /usr/bin/pwauth \n\ chown -R apache:apache /var/log/httpd \n\ \n\ -for file in /etc/httpd/conf/httpd.conf /etc/httpd/conf/sites.d/default_vhost.d/50-rx3.conf \n\ +for file in /etc/httpd/conf/httpd.conf '${HTTPD_CONF_FILE}' \n\ do \n\ sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" ${file} \n\ done \n\ @@ -107,7 +109,7 @@ RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} && 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/30-rx3.conf \ + && echo -e "${HTTPD_CONF}" | sed -e "s/\`/'/g" -e 's/ *$//' > ${HTTPD_CONF_FILE} \ && echo -e "${INFO_PHP}" | sed -e "s/\`/'/g" -e 's/ *$//' > /var/www/html/info.php diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 102159a..7243052 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/PHP-Apache V 1.6.3 - A. GIBERT - 2026/02/15 +------------------------------------------------------------------------------------------------------------------------------------ + +- Fix rx3.conf file renaming bug. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/PHP-Apache V 1.6.2 - A. GIBERT - 2026/02/14 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/env.dist b/env.dist index 74f0591..0bdf384 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.2-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.6.3-mga9 ${ORG_URL_PREFIX} server 1.3.0-mga9 httpd - 8080 80 - - apache apache