diff --git a/Dockerfile b/Dockerfile index 5077205..45d1fff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,8 @@ LABEL maintainer=${IMG_MAINTAINER} 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.update -a \ + && 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 passwd -d root diff --git a/ReadMe.txt b/ReadMe.txt index 53f5b2d..8a05bc8 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -10,11 +10,11 @@ Features: - Target user & group created on the run, - Optional output internet routing. - Usage: ./bin/run.sh [-h] [-i] [Args...] + Enjoy it! Your Rx3 Team. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 673dbb3..55ad021 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,8 +1,18 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/X11-Pulse V 1.2.3 - A. GIBERT - 2025/04/14 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add sabsolute & relative command path support, +- Add spaces support in Application Dir & Command. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/X11-Pulse V 1.2.2 - A. GIBERT - 2025/04/13 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/base:1.3.2-mga9 image. +- Use now rx3-docker/base:1.3.2-mga9 image, +- Add "urpmi.update -a" to force mirror sync. diff --git a/bin/run.sh b/bin/run.sh index 8a0e540..e1dfedb 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -32,6 +32,8 @@ shift +APPL_DIR=$(realpath ${APPL_DIR}) + export USER_ID=$(id -u) export GROUP_ID=$(id -g) export GROUP_NAME=$(id -gn) @@ -41,6 +43,6 @@ 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 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/env.dist b/env.dist index 2b5d04f..5b72682 100644 --- a/env.dist +++ b/env.dist @@ -20,7 +20,7 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" APPL_NAME="x11-pulse" APPL_NAME_FULL="X11-Pulse Docker Image" APPL_NAME_SHORT="x11-pulse" -APPL_VERSION="1.2.2" +APPL_VERSION="1.2.3" HOST_NAME_PREFIX=${APPL_NAME_SHORT}${APPL_SUFFIX} diff --git a/src/sbin/user_add_exec b/src/sbin/user_add_exec index a498029..4f785da 100755 --- a/src/sbin/user_add_exec +++ b/src/sbin/user_add_exec @@ -1,23 +1,24 @@ #!/bin/bash -for arg in User_Id User_Name Home_Dir Group_Id Group_Name +for arg in User_Id User_Name Home_Dir Group_Id Group_Name Appl_Dir do declare "$arg"=$1 shift done +Cmd=$( printf " %q" "$@" | sed -e 's/^ //' -e 's/\\;/;/g') -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 "User Add & Exec: User_Id: (${User_Id}) User_Name: [${User_Name}] Home_Dir: [${Home_Dir}] Group_Id: (${Group_Id}) Group_Name: [${Group_Name}] Appl_Dir: [${Appl_Dir}]" +echo -n " Display: [${DISPLAY}] Cmd: [${Cmd}]" -i=2 +#i=2 -while [[ $i -le $# ]] -do - echo -n " [${!i}]" - i=$(($i + 1)) -done +#while [[ $i -le $# ]] +#do +# echo -n " [${!i}]" +# i=$(($i + 1)) +#done echo "" echo "" @@ -46,8 +47,9 @@ chown ${User_Name}:${Group_Name} /run/user/${User_Id} echo "Exec Cmd..." + #echo "su - -P ${User_Name} -c \"$*\"" -su - -P ${User_Name} -c "$*" +su - -P ${User_Name} -c "cd \"${Appl_Dir}\"; ${Cmd}" echo "Completed!"