- 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.
This commit is contained in:
parent
e795826ec4
commit
77bb7d9185
@ -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.6
|
||||||
|
|
||||||
ARG IMG_NAME
|
ARG IMG_NAME
|
||||||
ARG IMG_FULL_NAME
|
ARG IMG_FULL_NAME
|
||||||
|
@ -1,8 +1,19 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
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
|
Rx3/X11-Pulse-Mga9 V 1.1.4 - A. GIBERT - 2024/08/28
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Update to base-mga9:1.2.4 image.
|
- Update to rx3/base-mga9:1.2.4 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -10,7 +21,7 @@ Rx3/X11-Pulse-Mga9 V 1.1.4 - A. GIBERT - 2024/08/28
|
|||||||
Rx3/X11-Pulse-Mga9 V 1.1.3 - A. GIBERT - 2024/08/27
|
Rx3/X11-Pulse-Mga9 V 1.1.3 - A. GIBERT - 2024/08/27
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Update to base-mga9:1.2.3 image.
|
- Update to rx3/base-mga9:1.2.3 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -18,7 +29,7 @@ Rx3/X11-Pulse-Mga9 V 1.1.3 - A. GIBERT - 2024/08/27
|
|||||||
Rx3/X11-Pulse-Mga9 V 1.1.2 - A. GIBERT - 2024/08/25
|
Rx3/X11-Pulse-Mga9 V 1.1.2 - A. GIBERT - 2024/08/25
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Update to base-mga9:1.2.1 image.
|
- Update to rx3/base-mga9:1.2.1 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -44,6 +55,6 @@ 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,
|
- Based on rx3/base-mga9:1.2.0 image,
|
||||||
- X11 & Pulse ready,
|
- X11 & Pulse ready,
|
||||||
- user_add_exec installed.
|
- user_add_exec installed.
|
||||||
|
@ -20,7 +20,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
- DISPLAY=:0
|
DISPLAY: ":0"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
- home_dir:/home
|
- home_dir:/home
|
||||||
@ -31,8 +31,8 @@ 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_DIR}"
|
||||||
target: ${APPL_DIR}
|
target: "${APPL_DIR}"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
- ${APPL_NETWORK}
|
- ${APPL_NETWORK}
|
||||||
|
@ -18,7 +18,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
|
|||||||
|
|
||||||
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.1.5"
|
||||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
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>'
|
||||||
|
|
12
run.sh
12
run.sh
@ -1,5 +1,13 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
|
||||||
|
APPL_HOME_DIR="$(dirname "$(dirname "$0")")"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
if [[ "$1" == "-h" ]]
|
if [[ "$1" == "-h" ]]
|
||||||
then
|
then
|
||||||
echo "usage: run.sh [-h] [-i] <Application_Dir> <Application_Exec> [Args...]"
|
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)
|
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} $*
|
docker compose run --rm default /sbin/user_add_exec ${USER_ID} ${USER} ${HOME} ${GROUP_ID} ${GROUP_NAME} ${APPL_DIR}/${APPL_NAME} $*
|
||||||
|
Loading…
Reference in New Issue
Block a user