Compare commits

..

No commits in common. "master" and "wine-1.0.0" have entirely different histories.

4 changed files with 21 additions and 48 deletions

View File

@ -5,12 +5,11 @@ 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.
Features:
- Curtently based on rx3-docker/x11-pulse:1.2.3-mga9 image,
- Support by defaul volatile Wine dir (/tmp/wine) or non volatile (~/.wine).
- Curtently based on rx3-docker/x11-pulse:1.2.2-mga9 image.
Usage:
./bin/run.sh [-h] [-i] [-n] <Application Dir> <Application Exec> [Args...]
./bin/run.sh [-h] [-i] <Application Dir> <Application Exec> [Args...]
Enjoy it!

View File

@ -1,17 +1,6 @@
------------------------------------------------------------------------------------------------------------------------------------
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
------------------------------------------------------------------------------------------------------------------------------------
- Initial release,
- Initial relase,
- Based on rx3-docker/x11-pulse:1.2.2-mga9 image.

View File

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

View File

@ -20,7 +20,7 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
APPL_NAME="wine"
APPL_NAME_FULL="Wine Docker Image"
APPL_NAME_SHORT="wine"
APPL_VERSION="1.0.1"
APPL_VERSION="1.0.0"
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 |
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+---------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
docker_service_add WN wine ${ORG_URL_PREFIX} - "Rx3-Docker/Wine" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} x11-pulse 1.2.3-mga9 - - - - - - - -
docker_service_add WN wine ${ORG_URL_PREFIX} - "Rx3-Docker/Wine" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} x11-pulse 1.2.2-mga9 - - - - - - - -