diff --git a/ReadMe.txt b/ReadMe.txt index e5599b8..f920731 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to RX3-Docker/X11-Pulse docker image! This is project aims to build a X11 + Pulse 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 rx3-docker/base:1.3.1-mga9 image, - X11 & Pulse base libraries installed, - Target user & group created on the run, - Optional output internet routing. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 6905f36..14203f3 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/X11-Pulse V 1.2.1 - A. GIBERT - 2025/03/08 +------------------------------------------------------------------------------------------------------------------------------------ + +- Use now rx3-docker/base:1.3.1-mga9 image, +- Fix some env.dist variables, +- Improve network naming. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/X11-Pulse V 1.2.0 - A. GIBERT - 2024/11/18 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/bin/run.sh b/bin/run.sh index 037a44f..8a0e540 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -42,3 +42,5 @@ cd "${APPL_HOME_DIR}" 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} $* + +docker compose down diff --git a/compose.yaml b/compose.yaml index 1f716fd..a14829d 100644 --- a/compose.yaml +++ b/compose.yaml @@ -5,6 +5,8 @@ name: ${XP_IMG_NAME} services: +#------------------------------------------------------------------------------- + x11-pulse: container_name: ${XP_HOST_NAME} hostname: ${XP_HOST_NAME} @@ -26,7 +28,8 @@ services: DISPLAY: ":0" volumes: - - home_dir:/home +# - home_dir:/home + - /opt/vm/home:/home - type: bind source: /tmp/.X11-unix/X0 target: /tmp/.X11-unix/X0 @@ -46,11 +49,20 @@ volumes: external: true + +#------------------------------------------------------------------------------- + networks: internet: + name: ${NETWORK_NAME}-internet driver: bridge internal: false # Allow internet access + driver_opts: + com.docker.network.bridge.name: ${NETWORK_IF_NAME} no-internet: + name: ${NETWORK_NAME}-no-internet driver: bridge internal: true # Block internet access + driver_opts: + com.docker.network.bridge.name: ${NETWORK_IF_NAME} diff --git a/env.dist b/env.dist index 6249889..7cfa6bb 100644 --- a/env.dist +++ b/env.dist @@ -17,19 +17,36 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" # Image Settings #------------------------------------------------------------------------------- +APPL_NAME="x11-pulse" +APPL_NAME_FULL="X11-Pulse Docker Image" +APPL_NAME_SHORT="x11-pulse" +APPL_VERSION="1.2.1" -HOST_NAME_PREFIX="" +HOST_NAME_PREFIX=${APPL_NAME_SHORT}${APPL_SUFFIX} PORT_ENV_OFFSET=0 + +PORT_SV_INT=9001 PORT_SV_OFFSET=1000 +NETWORK_NAME=${HOST_NAME_PREFIX} +NETWORK_IF_NAME=br-${NETWORK_NAME} -#------------------+----------+--------------------+--------------------------+------------------------------------------+------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ -# | 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_TOOLS_DEBUG=FALSE -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 - - - - - - - - +DOCKER_TOOLS_VOLUME=SINGLE +#DOCKER_TOOLS_VOLUME=MIXED +#DOCKER_TOOLS_VOLUME=MERGED +#DOCKER_TOOLS_VOLUME=SPLIT + +#DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql" + +#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+---------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ +# | Variable | Service | Target Image | From Image | Module | Main Port | Admin Port | User | Group | +# | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | +#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+---------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ + +docker_service_add XP x11-pulse ${ORG_URL_PREFIX} - "Rx3-Docker X11 Pulse" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} base 1.3.1-mga9 - - - - - - - -