Compare commits

...

4 Commits

Author SHA1 Message Date
77bb7d9185 - 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.
2024-10-07 15:19:00 +02:00
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
7 changed files with 92 additions and 26 deletions

13
.env
View File

@ -1,13 +0,0 @@
# Rx3 X11 Pulse Mageia-9 Docker Image
#-------------------------------------------------------------------------------
IMG_NAME="x11-pulse-mga9"
IMG_FULL_NAME="Rx3 X11 Pulse Mageia-9 Docker Image"
IMG_VERSION="1.1.1"
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
# To be defined / overwrited at run time
USER_ID=""
APPL_DIR=""
APPL_NETWORK="no-internet"

View File

@ -1,7 +1,7 @@
# 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.6
ARG IMG_NAME
ARG IMG_FULL_NAME

View File

@ -1,11 +1,11 @@
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.
Features:
- Curtently based on base-mga9:1.2.0 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.

View File

@ -1,5 +1,40 @@
------------------------------------------------------------------------------------------------------------------------------------
X11-Pulse-Mga9 V 1.1.1 - A. GIBERT - 2024/08/23
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.
------------------------------------------------------------------------------------------------------------------------------------
Rx3/X11-Pulse-Mga9 V 1.1.3 - A. GIBERT - 2024/08/27
------------------------------------------------------------------------------------------------------------------------------------
- Update to rx3/base-mga9:1.2.3 image.
------------------------------------------------------------------------------------------------------------------------------------
Rx3/X11-Pulse-Mga9 V 1.1.2 - A. GIBERT - 2024/08/25
------------------------------------------------------------------------------------------------------------------------------------
- Update to rx3/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,
@ -8,7 +43,7 @@ X11-Pulse-Mga9 V 1.1.1 - A. GIBERT - 2024/08/23
------------------------------------------------------------------------------------------------------------------------------------
X11-Pulse-Mga9 V 1.1.0 - A. GIBERT - 2024/08/23
Rx3/X11-Pulse-Mga9 V 1.1.0 - A. GIBERT - 2024/08/23
------------------------------------------------------------------------------------------------------------------------------------
- Remove Emacs to lighten the image weight...
@ -16,10 +51,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,
- Use based on base-mga9:1.2.0 image,
- Based on rx3/base-mga9:1.2.0 image,
- X11 & Pulse ready,
- user_add_exec installed.

View File

@ -6,7 +6,8 @@ name: ${IMG_NAME}
services:
default:
container_name: ${IMG_NAME}
image: docker.xor.rx3:5000/rx3/${IMG_NAME}:${IMG_VERSION}
image: ${IMG_URL}
build:
context: .
@ -19,7 +20,7 @@ services:
restart: unless-stopped
environment:
- DISPLAY=:0
DISPLAY: ":0"
volumes:
- home_dir:/home
@ -30,12 +31,10 @@ 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:
# - internet
# - no-internet
- ${APPL_NETWORK}

33
env Normal file
View File

@ -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.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"

12
run.sh
View File

@ -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} $*