From 9736f810163a52f0ffa73001322667db5a8d70f0 Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Tue, 27 Aug 2024 00:39:57 +0200
Subject: [PATCH] - Now use rx3/server-mga9:1.1.1 image, - Remove test init
 service, - Minor compose / dockerfile args & structure improvements.

---
 .env             |  8 ++++----
 Dockerfile       | 13 +++++--------
 ReadMe.txt       |  2 +-
 ReleaseNotes.txt | 10 ++++++++++
 compose.yaml     |  8 ++++----
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/.env b/.env
index 84e0617..4e34110 100644
--- a/.env
+++ b/.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.1"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
 
diff --git a/Dockerfile b/Dockerfile
index 7082029..537ec42 100644
--- a/Dockerfile
+++ b/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.1
 
-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}
 
 
@@ -57,9 +57,6 @@ RUN    urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_
     && echo -e   "${HTTPD}"        | sed -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
 
 
diff --git a/ReadMe.txt b/ReadMe.txt
index cd8645a..d4915e6 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.0 image,
+    - Curtently based on rx3/server-mga9:1.1.1 image,
     - PostgreSQL & MySQL ready,
     - PHPMailer installed,
     - logrotate configured,
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index c254892..345d0b1 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,13 @@
+------------------------------------------------------------------------------------------------------------------------------------
+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
 ------------------------------------------------------------------------------------------------------------------------------------
diff --git a/compose.yaml b/compose.yaml
index 0ec624c..a99eccc 100644
--- a/compose.yaml
+++ b/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"