Compare commits

...

4 Commits

Author SHA1 Message Date
e795826ec4 - Update to base-mga9:1.2.4 image. 2024-08-28 18:24:40 +02:00
433fd789a4 - Update to base-mga9:1.2.3 image. 2024-08-27 01:25:14 +02:00
502680793e - Update to base-mga9:1.2.1 image,
- Minor compose file updates.
2024-08-25 00:47:59 +02:00
6017327425 - Add internet output routing option on run time execution,
- Fix application args passing.
2024-08-23 17:42:22 +02:00
7 changed files with 118 additions and 21 deletions

28
.env
View File

@ -1,11 +1,33 @@
# Rx3 X11 Pulse Mageia-9 Docker Image # 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_NAME="x11-pulse-mga9"
IMG_FULL_NAME="Rx3 X11 Pulse Mageia-9 Docker Image" IMG_FULL_NAME="Rx3 X11 Pulse Mageia-9 Docker Image"
IMG_VERSION="1.1.0" IMG_VERSION="1.1.4"
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>' IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
# To be difines at run time
#-------------------------------------------------------------------------------
# User Settings (overwrited at run time)
#-------------------------------------------------------------------------------
USER_ID="" USER_ID=""
APPL_HOME_DIR="" APPL_DIR=""
APPL_NETWORK="no-internet"

View File

@ -1,7 +1,7 @@
# Rx3 X11 Pulse Mageia-9 Docker Image # Rx3 X11 Pulse Mageia-9 Docker Image
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
FROM docker.xor.rx3:5000/rx3/base-mga9:1.2.0 FROM docker.xor.rx3:5000/rx3/base-mga9:1.2.4
ARG IMG_NAME ARG IMG_NAME
ARG IMG_FULL_NAME ARG IMG_FULL_NAME

View File

@ -1,17 +1,18 @@
Welcome to X11-Pulse-Mga9 docker image! Welcome to RX3/X11-Pulse-Mga9 docker image!
This is project aims to build a X11 + Pulse + Mageia-9 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: Features:
- Curtently based on base-mga9:1.2.0 image, - Curtently based on base-mga9:1.2.4 image,
- X11 & Pulse base libraries installed, - X11 & Pulse base libraries installed,
- user_add_exec program to create on the run the user environement. - Target user & group created on the run,
- Optional output internet routing.
Usage: Usage:
./run.sh <Application Dir> <Application Exec> ./run.sh [-h] [-i] <Application Dir> <Application Exec> [Args...]
Enjoy it! Enjoy it!

View File

@ -1,5 +1,38 @@
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
X11-Pulse-Mga9 V 1.1.0 - A. GIBERT - 2024/08/23 Rx3/X11-Pulse-Mga9 V 1.1.4 - A. GIBERT - 2024/08/28
------------------------------------------------------------------------------------------------------------------------------------
- Update to base-mga9:1.2.4 image.
------------------------------------------------------------------------------------------------------------------------------------
Rx3/X11-Pulse-Mga9 V 1.1.3 - A. GIBERT - 2024/08/27
------------------------------------------------------------------------------------------------------------------------------------
- Update to base-mga9:1.2.3 image.
------------------------------------------------------------------------------------------------------------------------------------
Rx3/X11-Pulse-Mga9 V 1.1.2 - A. GIBERT - 2024/08/25
------------------------------------------------------------------------------------------------------------------------------------
- Update to base-mga9:1.2.1 image.
------------------------------------------------------------------------------------------------------------------------------------
Rx3/X11-Pulse-Mga9 V 1.1.1 - A. GIBERT - 2024/08/23
------------------------------------------------------------------------------------------------------------------------------------
- Add internet output routing option on run time execution,
- Fix application args passing.
------------------------------------------------------------------------------------------------------------------------------------
Rx3/X11-Pulse-Mga9 V 1.1.0 - A. GIBERT - 2024/08/23
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Remove Emacs to lighten the image weight... - Remove Emacs to lighten the image weight...
@ -7,10 +40,10 @@ X11-Pulse-Mga9 V 1.1.0 - A. GIBERT - 2024/08/23
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
X11-Pulse-Mga9 V 1.0.0 - A. GIBERT - 2024/08/23 Rx3/X11-Pulse-Mga9 V 1.0.0 - A. GIBERT - 2024/08/23
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Initial release, - Initial release,
- Use based on base-mga9:1.2.0 image, - Based on base-mga9:1.2.0 image,
- X11 & Pulse ready, - X11 & Pulse ready,
- user_add_exec installed. - user_add_exec installed.

View File

@ -6,7 +6,8 @@ name: ${IMG_NAME}
services: services:
default: default:
container_name: ${IMG_NAME} container_name: ${IMG_NAME}
image: docker.xor.rx3:5000/rx3/${IMG_NAME}:${IMG_VERSION}
image: ${IMG_URL}
build: build:
context: . context: .
@ -30,11 +31,24 @@ services:
source: /run/user/${USER_ID}/pulse source: /run/user/${USER_ID}/pulse
target: /run/user/${USER_ID}/pulse target: /run/user/${USER_ID}/pulse
- type: bind - type: bind
source: ${APPL_HOME_DIR} source: ${APPL_DIR}
target: ${APPL_HOME_DIR} target: ${APPL_DIR}
networks:
- ${APPL_NETWORK}
network_mode: bridge
volumes: volumes:
home_dir: home_dir:
external: true external: true
networks:
internet:
driver: bridge
internal: false # Allow internet access
no-internet:
driver: bridge
internal: true # Block internet access

20
run.sh
View File

@ -1,6 +1,22 @@
#!/bin/bash #!/bin/bash
export APPL_HOME_DIR="$1" if [[ "$1" == "-h" ]]
then
echo "usage: run.sh [-h] [-i] <Application_Dir> <Application_Exec> [Args...]"
echo "with -i enabling internet access."
exit 0
fi
if [[ "$1" == "-i" ]]
then
shift;
export APPL_NETWORK="internet"
else
export APPL_NETWORK="no-internet"
fi
export APPL_DIR="$1"
shift shift
export APPL_NAME="$1" export APPL_NAME="$1"
@ -13,4 +29,4 @@ export GROUP_ID=$(id -g)
export GROUP_NAME=$(id -gn) export GROUP_NAME=$(id -gn)
docker compose run --rm default /sbin/user_add_exec ${USER_ID} ${USER} ${HOME} ${GROUP_ID} ${GROUP_NAME} ${APPL_HOME_DIR}/${APPL_NAME} $* docker compose run --rm default /sbin/user_add_exec ${USER_ID} ${USER} ${HOME} ${GROUP_ID} ${GROUP_NAME} ${APPL_DIR}/${APPL_NAME} $*

View File

@ -8,8 +8,18 @@ done
echo "User Add & Exec: User_Id: (${User_Id}) User_Name: [${User_Name}] Home_Dir: [${Home_Dir}] Group_Id: (${Group_Id}) Group_Name: [${Group_Name}]" echo "User Add & Exec: User_Id: (${User_Id}) User_Name: [${User_Name}] Home_Dir: [${Home_Dir}] Group_Id: (${Group_Id}) Group_Name: [${Group_Name}]"
echo " Display: [${DISPLAY}] Cmd: [${*}]" echo -n " Display: [${DISPLAY}] Cmd: [$1]"
i=2
while [[ $i -le $# ]]
do
echo -n " [${!i}]"
i=$(($i + 1))
done
echo ""
echo "" echo ""
@ -36,7 +46,8 @@ chown ${User_Name}:${Group_Name} /run/user/${User_Id}
echo "Exec Cmd..." echo "Exec Cmd..."
#echo "su - -P ${User_Name} -c \"$*\""
su - -P ${User_Name} -c $* su - -P ${User_Name} -c "$*"
echo "Completed!" echo "Completed!"