- Now use rx3/server-mga9:1.1.2 image,

- Fix Apache root document not updated in /etc/httpd/conf/conf.d/rx3.conf.

.env

@@ -15,10 +15,10 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
 # Image Settings
 #-------------------------------------------------------------------------------
 
-IMG_ID="php-apache-mga9"
-IMG_NAME="Rx3 PHP Apache Mageia-9 Docker Image"
-IMG_VERSION="1.3.0"
-IMG_URL="${IMG_URL_PREFIX}/${IMG_ID}:${IMG_VERSION}"
+IMG_NAME="php-apache-mga9"
+IMG_FULL_NAME="Rx3 PHP Apache Mageia-9 Docker Image"
+IMG_VERSION="1.3.2"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
 

Dockerfile

@@ -3,16 +3,16 @@
 
 ARG IMG_URL_PREFIX="rx3"
 
-FROM ${IMG_URL_PREFIX}/server-mga9:1.1.0
+FROM ${IMG_URL_PREFIX}/server-mga9:1.1.2
 
-ARG IMG_ID
 ARG IMG_NAME
+ARG IMG_FULL_NAME
 ARG IMG_VERSION
 ARG IMG_MAINTAINER
 
-LABEL org.rx3.${IMG_ID}.name=${IMG_NAME}
-LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION}
-LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER}
+LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
+LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
+LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
 
@@ -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,15 +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   "#!/bin/bash\n\necho 'hello world!' >/tmp/toto\necho 'Test init completed.'" > /etc/init.d/test  \
-    && chmod a+x /etc/init.d/test                                                                                 \
-    && ln   -s   /etc/init.d/test /etc/rcD.d/S20test                                                              \
-    && 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

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.0 image,
+    - Curtently based on rx3/server-mga9:1.1.2 image,
     - PostgreSQL & MySQL ready,
     - PHPMailer installed,
     - logrotate configured,

ReleaseNotes.txt

@@ -1,3 +1,22 @@
+------------------------------------------------------------------------------------------------------------------------------------
+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
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Now use rx3/server-mga9:1.1.1 image,
+- Remove test init service,
+- Minor compose / dockerfile args & structure improvements.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3/PHP-Apache-Mga9 V 1.3.0 - A. GIBERT - 2024/08/26
 ------------------------------------------------------------------------------------------------------------------------------------

compose.yaml

@@ -1,20 +1,20 @@
 # Rx3 PHP Apache Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
-name: ${IMG_ID}
+name: ${IMG_NAME}
 
 services:
 
   webapp:
-    container_name: ${IMG_ID}
+    container_name: ${IMG_NAME}
     
     image: ${IMG_URL}
 
     build:
       context: .
       args:
-        - IMG_ID=${IMG_ID}
         - IMG_NAME=${IMG_NAME}
+        - IMG_FULL_NAME=${IMG_FULL_NAME}
         - IMG_VERSION=${IMG_VERSION}
         - IMG_MAINTAINER=${IMG_MAINTAINER}
         - IMG_URL_PREFIX=${IMG_URL_PREFIX}
@@ -29,5 +29,5 @@ services:
     network_mode: bridge
     
     ports:
-      - "127.0.0.1:9010:9001"
+      - "127.0.0.1:9011:9001"
       - "127.0.0.1:8080:80"