.env

@@ -0,0 +1,33 @@
+# Rx3 X11 Pulse Mageia-9 Docker Image
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Global Settings
+#-------------------------------------------------------------------------------
+
+IMG_ORG="rx3"
+IMG_REGISTRY="docker.xor.rx3:5000"
+IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
+
+
+
+#-------------------------------------------------------------------------------
+# Image Settings
+#-------------------------------------------------------------------------------
+
+
+IMG_NAME="x11-pulse-mga9"
+IMG_FULL_NAME="Rx3 X11 Pulse Mageia-9 Docker Image"
+IMG_VERSION="1.1.4"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
+IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
+
+
+
+#-------------------------------------------------------------------------------
+# User Settings (overwrited at run time)
+#-------------------------------------------------------------------------------
+
+USER_ID=""
+APPL_DIR=""
+APPL_NETWORK="no-internet"

Dockerfile

@@ -1,20 +1,19 @@
-# Rx3-Docker/X11-Pulse Docker Image
+# Rx3 X11 Pulse Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
-ARG IMG_FROM_URL="rx3-docker/base:latest"
+FROM docker.xor.rx3:5000/rx3/base-mga9:1.2.4
-
-FROM ${IMG_FROM_URL}
 
 ARG IMG_NAME
-ARG IMG_NAME_FULL
+ARG IMG_FULL_NAME
 ARG IMG_VERSION
 ARG IMG_MAINTAINER
 
-LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
+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}
 
+
 ENV DISPLAY=:0
 
 
@@ -22,7 +21,7 @@ RUN    urpmi --force xterm lib64jack0 lib64opencl1 pipewire-media-session lib64p
 
 #RUN     passwd   -d root
 
-COPY src/sbin/user_add_exec /usr/local/sbin
+COPY /sbin/user_add_exec /sbin
 
 VOLUME /home
 VOLUME /tmp/.X11-unix/X0

ReadMe.txt

@@ -1,18 +1,18 @@
-Welcome to RX3-Docker/X11-Pulse docker image!
+Welcome to RX3/X11-Pulse-Mga9 docker image!
 
 
 
-This is project aims to build a X11 + Pulse docker image able to run any graphic & audio application isolated.
+This is project aims to build a X11 + Pulse + Mageia-9 docker image able to run any graphic & audio application isolated.
 
 Features:
-    - Curtently based on rx3-docker/base:1.3.0-mga9 image,
+    - Curtently based on base-mga9:1.2.4 image,
     - X11 & Pulse base libraries installed,
     - Target user & group created on the run,
     - Optional output internet routing.
 
 
 Usage:
-    ./bin/run.sh [-h] [-i] <Application Dir> <Application Exec> [Args...]
+    ./run.sh [-h] [-i] <Application Dir> <Application Exec> [Args...]
 
 
 Enjoy it!
@@ -21,4 +21,4 @@ Your Rx3 Team.
 
 --
 arnaud@rx3.net
-https://git.rx3.org/gitea/rx3-docker/x11-pulse
+https://git.rx3.org/gitea/rx3/x11-pulse-mga9

ReleaseNotes.txt

@@ -1,32 +1,8 @@
-------------------------------------------------------------------------------------------------------------------------------------
-Rx3-Docker/X11-Pulse V 1.2.0 - A. GIBERT - 2024/11/18
-------------------------------------------------------------------------------------------------------------------------------------
-
-- Move & Rename repo from Rx3/X11-Pulse-MGA9 to Rx3-Docker/X11-Pulse,
-- New version naming standard,
-- Now use docker_tools for .env building,
-- Now use docker_service_add macro,
-- Use now rx3-docker/base:1.3.0-mga9 image,
-- Create bin & src/sbin directories.
-
-
-
-------------------------------------------------------------------------------------------------------------------------------------
-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 rx3/base-mga9:1.2.4 image.
+- Update to base-mga9:1.2.4 image.
 
 
 
@@ -34,7 +10,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 rx3/base-mga9:1.2.3 image.
+- Update to base-mga9:1.2.3 image.
 
 
 
@@ -42,7 +18,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 rx3/base-mga9:1.2.1 image.
+- Update to base-mga9:1.2.1 image.
 
 
 
@@ -68,6 +44,6 @@ Rx3/X11-Pulse-Mga9 V 1.0.0 - A. GIBERT - 2024/08/23
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Initial release,
-- Based on rx3/base-mga9:1.2.0 image,
+- Based on base-mga9:1.2.0 image,
 - X11 & Pulse ready,
 - user_add_exec installed.

compose.yaml

@@ -1,29 +1,26 @@
-# Rx3-Docker/X11-Pulse Docker Image
+# Rx3 X11 Pulse Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
-name:                               ${XP_IMG_NAME}
+name: ${IMG_NAME}
 
 services:
+  default:
+    container_name: ${IMG_NAME}
     
-  x11-pulse:
+    image: ${IMG_URL}
-    container_name:                 ${XP_HOST_NAME}
-    hostname:                       ${XP_HOST_NAME}
-    
-    image:                          ${XP_IMG_URL}
     
     build:
       context: .
       args:
-        IMG_NAME:                   ${XP_IMG_NAME}
+        - IMG_NAME=${IMG_NAME}
-        IMG_NAME_FULL:              ${XP_IMG_NAME_FULL}
+        - IMG_FULL_NAME=${IMG_FULL_NAME}
-        IMG_VERSION:                ${XP_IMG_VERSION}
+        - IMG_VERSION=${IMG_VERSION}
-        IMG_MAINTAINER:             ${XP_IMG_MAINTAINER}
+        - IMG_MAINTAINER=${IMG_MAINTAINER}
-        IMG_FROM_URL:               ${XP_IMG_FROM_URL}
         
     restart: unless-stopped
     
     environment:
-        DISPLAY:                    ":0"
+        - DISPLAY=:0
 
     volumes:
         - home_dir:/home
@@ -34,8 +31,8 @@ services:
           source: /run/user/${USER_ID}/pulse
           target: /run/user/${USER_ID}/pulse
         - type: bind
-          source:                   "${APPL_DIR}"
+          source: ${APPL_DIR}
-          target:                   "${APPL_DIR}"
+          target: ${APPL_DIR}
 
     networks:
        - ${APPL_NETWORK}
@@ -54,3 +51,4 @@ networks:
   no-internet:
     driver: bridge
     internal: true    # Block internet access
+    

env.dist

@@ -1,42 +0,0 @@
-# Rx3-Docker/X11-Pulse Docker Image
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# Global Settings
-#-------------------------------------------------------------------------------
-
-ORG_NAME="rx3-docker"
-ORG_REGISTRY="docker.xor.rx3:5000"
-ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
-
-ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
-
-
-
-#-------------------------------------------------------------------------------
-# Image Settings
-#-------------------------------------------------------------------------------
-
-
-HOST_NAME_PREFIX=""
-
-PORT_ENV_OFFSET=0
-PORT_SV_OFFSET=1000
-
-
-#------------------+----------+--------------------+--------------------------+------------------------------------------+------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
-#                  | Variable | Target Image                                                                                          | From Image                                      | Module                    | Main Port     | Admin Port    | User         | Group        |
-#                  | Prefix   | URL Prefix         | Name                     | Name Full                                + Version    | URL Prefix         | Name          + Version    | Name         | Version    | Ext   | Int   | Ext   | Int   | Name / Id    | Name / Id    |
-#------------------+----------+--------------------+--------------------------+------------------------------------------+------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
-
-docker_service_add   XP         ${ORG_URL_PREFIX}    x11-pulse                  "Rx3-Docker X11 Pulse Docker Image"        1.2.0-mga9   ${ORG_URL_PREFIX}    base            1.3.0-mga9   -              -            -       -       -       -       -              -  
-
-
-
-#-------------------------------------------------------------------------------
-# User Settings (overwrited at run time)
-#-------------------------------------------------------------------------------
-
-USER_ID=""
-APPL_DIR=""
-APPL_NETWORK="no-internet"

run.sh

@@ -1,13 +1,5 @@
 #!/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...]"
@@ -37,8 +29,4 @@ export GROUP_ID=$(id -g)
 export GROUP_NAME=$(id -gn)
 
 
-cd "${APPL_HOME_DIR}"
+docker compose run --rm default /sbin/user_add_exec ${USER_ID} ${USER} ${HOME} ${GROUP_ID} ${GROUP_NAME} ${APPL_DIR}/${APPL_NAME} $*
-
-sbin/docker_mk_env
-
-docker compose run --rm x11-pulse /usr/local/sbin/user_add_exec ${USER_ID} ${USER} ${HOME} ${GROUP_ID} ${GROUP_NAME} ${APPL_DIR}/${APPL_NAME} $*