From 77bb7d9185f4dd0f71e0eaf69dcbe5d91fe7ae02 Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Mon, 7 Oct 2024 15:19:00 +0200
Subject: [PATCH] - Update to rx3/base-mga9:1.2.6 image, - Variabilization of
 external server ports in env & compose file, - Now use docker_tools for .env
 building.

---
 Dockerfile       |  2 +-
 ReleaseNotes.txt | 19 +++++++++++++++----
 compose.yaml     |  6 +++---
 .env => env      |  2 +-
 run.sh           | 12 ++++++++++++
 5 files changed, 32 insertions(+), 9 deletions(-)
 rename .env => env (98%)

diff --git a/Dockerfile b/Dockerfile
index abc9d5a..12634ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Rx3 X11 Pulse Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
-FROM docker.xor.rx3:5000/rx3/base-mga9:1.2.4
+FROM docker.xor.rx3:5000/rx3/base-mga9:1.2.6
 
 ARG IMG_NAME
 ARG IMG_FULL_NAME
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 99436ba..aa77f15 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,8 +1,19 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/X11-Pulse-Mga9 V 1.1.5 - A. GIBERT - 2024/10/07
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Update to rx3/base-mga9:1.2.6 image,
+- Variabilization of external server ports in env & compose file,
+- Now use docker_tools for .env building.
+
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3/X11-Pulse-Mga9 V 1.1.4 - A. GIBERT - 2024/08/28
 ------------------------------------------------------------------------------------------------------------------------------------
 
-- Update to base-mga9:1.2.4 image.
+- Update to rx3/base-mga9:1.2.4 image.
 
 
 
@@ -10,7 +21,7 @@ Rx3/X11-Pulse-Mga9 V 1.1.4 - A. GIBERT - 2024/08/28
 Rx3/X11-Pulse-Mga9 V 1.1.3 - A. GIBERT - 2024/08/27
 ------------------------------------------------------------------------------------------------------------------------------------
 
-- Update to base-mga9:1.2.3 image.
+- Update to rx3/base-mga9:1.2.3 image.
 
 
 
@@ -18,7 +29,7 @@ Rx3/X11-Pulse-Mga9 V 1.1.3 - A. GIBERT - 2024/08/27
 Rx3/X11-Pulse-Mga9 V 1.1.2 - A. GIBERT - 2024/08/25
 ------------------------------------------------------------------------------------------------------------------------------------
 
-- Update to base-mga9:1.2.1 image.
+- Update to rx3/base-mga9:1.2.1 image.
 
 
 
@@ -44,6 +55,6 @@ Rx3/X11-Pulse-Mga9 V 1.0.0 - A. GIBERT - 2024/08/23
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Initial release,
-- Based on base-mga9:1.2.0 image,
+- Based on rx3/base-mga9:1.2.0 image,
 - X11 & Pulse ready,
 - user_add_exec installed.
diff --git a/compose.yaml b/compose.yaml
index 489fc7e..19e35ca 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -20,7 +20,7 @@ services:
     restart: unless-stopped
     
     environment:
-        - DISPLAY=:0
+        DISPLAY:  ":0"
 
     volumes:
         - home_dir:/home
@@ -31,8 +31,8 @@ services:
           source: /run/user/${USER_ID}/pulse
           target: /run/user/${USER_ID}/pulse
         - type: bind
-          source: ${APPL_DIR}
-          target: ${APPL_DIR}
+          source: "${APPL_DIR}"
+          target: "${APPL_DIR}"
 
     networks:
        - ${APPL_NETWORK}
diff --git a/.env b/env
similarity index 98%
rename from .env
rename to env
index 7f89586..8dd558d 100644
--- a/.env
+++ b/env
@@ -18,7 +18,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
 
 IMG_NAME="x11-pulse-mga9"
 IMG_FULL_NAME="Rx3 X11 Pulse Mageia-9 Docker Image"
-IMG_VERSION="1.1.4"
+IMG_VERSION="1.1.5"
 IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
diff --git a/run.sh b/run.sh
index 8b3cafe..b67a5e7 100755
--- a/run.sh
+++ b/run.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+set -o errexit
+
+APPL_HOME_DIR="$(dirname "$(dirname "$0")")"
+
+
+
+#-------------------------------------------------------------------------------
+
 if [[ "$1" == "-h" ]]
 then
     echo "usage: run.sh [-h] [-i] <Application_Dir> <Application_Exec> [Args...]"
@@ -29,4 +37,8 @@ export GROUP_ID=$(id -g)
 export GROUP_NAME=$(id -gn)
 
 
+cd "${APPL_HOME_DIR}"
+
+sbin/docker_mk_env
+
 docker compose run --rm default /sbin/user_add_exec ${USER_ID} ${USER} ${HOME} ${GROUP_ID} ${GROUP_NAME} ${APPL_DIR}/${APPL_NAME} $*