Compare commits

..

2 Commits

Author SHA1 Message Date
2924cd076b - Add '-n' for non volatile Wine dir. 2025-04-14 19:16:59 +02:00
bd61472ab2 - Now use rx3-docker/x11-pulse:1.2.3-mga9 image,
- Add absolute & relative command path support,
- Add spaces support in Application Dir & Command.
2025-04-14 14:24:46 +02:00
4 changed files with 49 additions and 22 deletions

View File

@ -5,11 +5,12 @@ Welcome to RX3-Docker/Wine docker image!
This is project aims to build a Wine + X11 + Pulse docker image able to run any windows graphic & audio application isolated. This is project aims to build a Wine + X11 + Pulse docker image able to run any windows graphic & audio application isolated.
Features: Features:
- Curtently based on rx3-docker/x11-pulse:1.2.2-mga9 image. - Curtently based on rx3-docker/x11-pulse:1.2.3-mga9 image,
- Support by defaul volatile Wine dir (/tmp/wine) or non volatile (~/.wine).
Usage: Usage:
./bin/run.sh [-h] [-i] <Application Dir> <Application Exec> [Args...] ./bin/run.sh [-h] [-i] [-n] <Application Dir> <Application Exec> [Args...]
Enjoy it! Enjoy it!

View File

@ -1,6 +1,17 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Wine V 1.0.1 - A. GIBERT - 2025/04/14
------------------------------------------------------------------------------------------------------------------------------------
- Now use rx3-docker/x11-pulse:1.2.3-mga9 image,
- Add absolute & relative command path support,
- Add spaces support in Application Dir & Command,
- Add '-n' for non volatile Wine dir.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Wine V 1.0.0 - A. GIBERT - 2025/04/13 Rx3-Docker/Wine V 1.0.0 - A. GIBERT - 2025/04/13
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Initial relase, - Initial release,
- Based on rx3-docker/x11-pulse:1.2.2-mga9 image. - Based on rx3-docker/x11-pulse:1.2.2-mga9 image.

View File

@ -1,4 +1,4 @@
#!/bin/bash -x #!/bin/bash
set -o errexit set -o errexit
@ -8,21 +8,34 @@ APPL_HOME_DIR="$(dirname "$(dirname "$0")")"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
if [[ "$1" == "-h" ]] export APPL_NETWORK="no-internet"
then Pre_Cmd="export WINEPREFIX=/tmp/wine; mkdir /tmp/wine;"
echo "usage: run.sh [-h] [-i] <Application_Dir> <Application_Exec> [Args...]"
echo "with -i enabling internet access."
while [[ "$1" == "-h" || "$1" == "-i" || "$1" == "-n" ]]
do
if [[ "$1" == "-h" ]]
then
echo "usage: run.sh [-h] [-n] [-i] <Application_Dir> <Application_Exec> [Args...]"
echo "with -i enabling internet access,"
echo "with -n enabling non volatile wine directory."
exit 0 exit 0
fi fi
if [[ "$1" == "-i" ]] if [[ "$1" == "-i" ]]
then then
shift; shift;
export APPL_NETWORK="internet" export APPL_NETWORK="internet"
else fi
export APPL_NETWORK="no-internet"
fi if [[ "$1" == "-n" ]]
then
shift;
Pre_Cmd=""
fi
done
export APPL_DIR="$1" export APPL_DIR="$1"
shift shift
@ -32,6 +45,8 @@ shift
APPL_DIR=$(realpath ${APPL_DIR})
export USER_ID=$(id -u) export USER_ID=$(id -u)
export GROUP_ID=$(id -g) export GROUP_ID=$(id -g)
export GROUP_NAME=$(id -gn) export GROUP_NAME=$(id -gn)
@ -41,6 +56,6 @@ cd "${APPL_HOME_DIR}"
sbin/docker_mk_env sbin/docker_mk_env
docker compose run --rm wine /usr/local/sbin/user_add_exec ${USER_ID} ${USER} ${HOME} ${GROUP_ID} ${GROUP_NAME} ${APPL_DIR}/${APPL_NAME} $* docker compose run --rm wine /usr/local/sbin/user_add_exec ${USER_ID} ${USER} ${HOME} ${GROUP_ID} ${GROUP_NAME} "${APPL_DIR}" ${Pre_Cmd} "${APPL_NAME}" "$@"
docker compose down docker compose down

View File

@ -20,7 +20,7 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
APPL_NAME="wine" APPL_NAME="wine"
APPL_NAME_FULL="Wine Docker Image" APPL_NAME_FULL="Wine Docker Image"
APPL_NAME_SHORT="wine" APPL_NAME_SHORT="wine"
APPL_VERSION="1.0.0" APPL_VERSION="1.0.1"
HOST_NAME_PREFIX=${APPL_NAME_SHORT}${APPL_SUFFIX} HOST_NAME_PREFIX=${APPL_NAME_SHORT}${APPL_SUFFIX}
@ -46,7 +46,7 @@ DOCKER_TOOLS_VOLUME=SINGLE
# | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | # | 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 WN wine ${ORG_URL_PREFIX} - "Rx3-Docker/Wine" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} x11-pulse 1.2.2-mga9 - - - - - - - - docker_service_add WN wine ${ORG_URL_PREFIX} - "Rx3-Docker/Wine" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} x11-pulse 1.2.3-mga9 - - - - - - - -