diff --git a/.env b/.env index 4e34110..0289566 100644 --- a/.env +++ b/.env @@ -17,7 +17,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" IMG_NAME="php-apache-mga9" IMG_FULL_NAME="Rx3 PHP Apache Mageia-9 Docker Image" -IMG_VERSION="1.3.1" +IMG_VERSION="1.3.2" IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" IMG_MAINTAINER='"Arnaud G. GIBERT" ' diff --git a/Dockerfile b/Dockerfile index 537ec42..94eb867 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG IMG_URL_PREFIX="rx3" -FROM ${IMG_URL_PREFIX}/server-mga9:1.1.1 +FROM ${IMG_URL_PREFIX}/server-mga9:1.1.2 ARG IMG_NAME ARG IMG_FULL_NAME @@ -41,7 +41,10 @@ groupmod -g ${APACHE_GID} apache \n\ chown -R apache:apache /var/log/httpd \n\ \n\ -sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" /etc/httpd/conf/httpd.conf' +for file in /etc/httpd/conf/httpd.conf /etc/httpd/conf/conf.d/rx3.conf \n\ +do \n\ + sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" ${file} \n\ +done' #--------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------- @@ -52,12 +55,12 @@ command=/usr/sbin/httpd -DFOREGROUND' RUN urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer \ - && echo -e "${HTTPD_CONF}" | sed -e 's/ *$//' > /etc/httpd/conf/conf.d/rx3.conf \ - && echo -e "${INFO_PHP}" | sed -e 's/ *$//' > /var/www/html/info.php \ - && echo -e "${HTTPD}" | sed -e 's/ *$//' > /etc/init.d/httpd \ + && 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 \ + && 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/ *$//' > /etc/supervisord.d/httpd.ini + && echo -e "${HTTPD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/httpd.ini VOLUME /var/www/html diff --git a/ReadMe.txt b/ReadMe.txt index d4915e6..6e2d5c3 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3/PHP-Apache-Mga9 docker image! This is project aims to build a PHP + Apache + Mageia 9 docker image used by others Rx3 packaging projects. Features: - - Curtently based on rx3/server-mga9:1.1.1 image, + - Curtently based on rx3/server-mga9:1.1.2 image, - PostgreSQL & MySQL ready, - PHPMailer installed, - logrotate configured, diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 345d0b1..d3d138b 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,12 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3/PHP-Apache-Mga9 V 1.3.2 - A. GIBERT - 2024/08/28 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3/server-mga9:1.1.2 image, +- Fix Apache root document not updated in /etc/httpd/conf/conf.d/rx3.conf. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/PHP-Apache-Mga9 V 1.3.1 - A. GIBERT - 2024/08/27 ------------------------------------------------------------------------------------------------------------------------------------