Rx3-Docker/x11-pulse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

- Move & Rename repo from Rx3/X11-Pulse-MGA9 to Rx3-Docker/X11-Pulse,

Browse Source 
- 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 src bin & dir/sbin directories.
This commit is contained in:
Arnaud G. GIBERT 2024-11-18 00:06:21 +01:00
parent 77bb7d9185
commit 1ec6476ff6
8 changed files with 93 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Dockerfile
View File

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

10
ReadMe.txt
View File

@ -1,18 +1,18 @@
Welcome to RX3/X11-Pulse-Mga9 docker image!
Welcome to RX3-Docker/X11-Pulse 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 docker image able to run any graphic & audio application isolated.
Features:
- Curtently based on base-mga9:1.2.4 image,
- Curtently based on rx3-docker/base:1.3.0-mga9 image,
- X11 & Pulse base libraries installed,
- Target user & group created on the run,
- Optional output internet routing.
Usage:
./run.sh [-h] [-i] <Application Dir> <Application Exec> [Args...]
./bin/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/x11-pulse-mga9
https://git.rx3.org/gitea/rx3-docker/x11-pulse

13
ReleaseNotes.txt
View File

@ -1,3 +1,16 @@
------------------------------------------------------------------------------------------------------------------------------------
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
------------------------------------------------------------------------------------------------------------------------------------

2
run.sh → bin/run.sh
View File

@ -41,4 +41,4 @@ 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} $*
docker compose run --rm x11-pulse /usr/local/sbin/user_add_exec ${USER_ID} ${USER} ${HOME} ${GROUP_ID} ${GROUP_NAME} ${APPL_DIR}/${APPL_NAME} $*

48
compose.yaml
View File

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

33
env
View File

@ -1,33 +0,0 @@
# 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.5"
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"

42
env.dist Normal file
View File

@ -0,0 +1,42 @@
# 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"

0
sbin/user_add_exec → src/sbin/user_add_exec
View File