Compare commits
No commits in common. "master" and "x11-pulse-mga9-1.0.0" have entirely different histories.
master
...
x11-pulse-
28
.env
28
.env
@ -1,33 +1,11 @@
|
|||||||
# 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.4"
|
IMG_VERSION="1.0.0"
|
||||||
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_DIR=""
|
APPL_HOME_DIR=""
|
||||||
APPL_NETWORK="no-internet"
|
|
||||||
|
@ -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.4
|
FROM docker.xor.rx3:5000/rx3/base-mga9:1.2.0
|
||||||
|
|
||||||
ARG IMG_NAME
|
ARG IMG_NAME
|
||||||
ARG IMG_FULL_NAME
|
ARG IMG_FULL_NAME
|
||||||
@ -17,9 +17,7 @@ LABEL maintainer=${IMG_MAINTAINER}
|
|||||||
ENV DISPLAY=:0
|
ENV DISPLAY=:0
|
||||||
|
|
||||||
|
|
||||||
RUN urpmi --force xterm lib64jack0 lib64opencl1 pipewire-media-session lib64proxy-webkit hunspell-en lib64xcb-xkb1 lib64xcomposite1 lib64xcursor1 lib64xdamage1 lib64xft-gir2.0 lib64xi6 lib64xinerama1 lib64xkbcommon0 lib64vulkan-loader1 lib64xlib-gir2.0 lib64xrandr2 lib64xmlb2 lib64xslt1 libexif12-common libgxps-tools frozen-bubble
|
RUN urpmi --force xterm lib64jack0 lib64opencl1 pipewire-media-session lib64proxy-webkit hunspell-en lib64xcb-xkb1 lib64xcomposite1 lib64xcursor1 lib64xdamage1 lib64xft-gir2.0 lib64xi6 lib64xinerama1 lib64xkbcommon0 lib64vulkan-loader1 lib64xlib-gir2.0 lib64xrandr2 lib64xmlb2 lib64xslt1 libexif12-common libgxps-tools frozen-bubble emacs
|
||||||
|
|
||||||
#RUN passwd -d root
|
|
||||||
|
|
||||||
COPY /sbin/user_add_exec /sbin
|
COPY /sbin/user_add_exec /sbin
|
||||||
|
|
||||||
|
@ -1,18 +1,17 @@
|
|||||||
Welcome to RX3/X11-Pulse-Mga9 docker image!
|
Welcome to 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.4 image,
|
- Curtently based on base-mga9:1.2.0 image,
|
||||||
- X11 & Pulse base libraries installed,
|
- X11 & Pulse base libraries installed,
|
||||||
- Target user & group created on the run,
|
- user_add_exec program to create on the run the user environement.
|
||||||
- Optional output internet routing.
|
|
||||||
|
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
./run.sh [-h] [-i] <Application Dir> <Application Exec> [Args...]
|
./run.sh <Application Dir> <Application Exec>
|
||||||
|
|
||||||
|
|
||||||
Enjoy it!
|
Enjoy it!
|
||||||
|
@ -1,49 +1,8 @@
|
|||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3/X11-Pulse-Mga9 V 1.1.4 - A. GIBERT - 2024/08/28
|
X11-Pulse-Mga9 V 1.0.0 - A. GIBERT - 2024/08/23
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
- 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...
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
|
||||||
Rx3/X11-Pulse-Mga9 V 1.0.0 - A. GIBERT - 2024/08/23
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Initial release,
|
- Initial release,
|
||||||
- Based on base-mga9:1.2.0 image,
|
- Use based on base-mga9:1.2.0 image,
|
||||||
- X11 & Pulse ready,
|
- X11 & Pulse ready,
|
||||||
- user_add_exec installed.
|
- user_add_exec installed.
|
||||||
|
22
compose.yaml
22
compose.yaml
@ -6,8 +6,7 @@ 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: .
|
||||||
@ -31,24 +30,11 @@ 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_DIR}
|
source: ${APPL_HOME_DIR}
|
||||||
target: ${APPL_DIR}
|
target: ${APPL_HOME_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
20
run.sh
@ -1,22 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if [[ "$1" == "-h" ]]
|
export APPL_HOME_DIR="$1"
|
||||||
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"
|
||||||
@ -29,4 +13,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_DIR}/${APPL_NAME} $*
|
docker compose run --rm default /sbin/user_add_exec ${USER_ID} ${USER} ${HOME} ${GROUP_ID} ${GROUP_NAME} ${APPL_HOME_DIR}/${APPL_NAME} $*
|
||||||
|
@ -8,18 +8,8 @@ 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 -n " Display: [${DISPLAY}] Cmd: [$1]"
|
echo " Display: [${DISPLAY}] Cmd: [${*}]"
|
||||||
|
|
||||||
i=2
|
|
||||||
|
|
||||||
while [[ $i -le $# ]]
|
|
||||||
do
|
|
||||||
echo -n " [${!i}]"
|
|
||||||
i=$(($i + 1))
|
|
||||||
done
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
|
||||||
@ -46,8 +36,7 @@ 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!"
|
||||||
|
Loading…
Reference in New Issue
Block a user