From 18a1aabd909abe08bd72d835a2e15e7ef8fcf710 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sat, 29 Nov 2025 12:00:41 +0100 Subject: [PATCH] - Improve run.sh to allow direct call with appl full path in one argument, - Now use rx3-docker/x11-pulse:1.2.6-mga9 image, - Rebuild for updates. --- ReadMe.txt | 4 ++-- ReleaseNotes.txt | 10 ++++++++++ bin/run.sh | 17 ++++++++++++----- env.dist | 4 ++-- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ReadMe.txt b/ReadMe.txt index c83bb4b..f053df1 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,11 +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.5-mga9 image, + - Curtently based on rx3-docker/x11-pulse:1.2.6-mga9 image, - Support by defaul volatile Wine dir (/tmp/wine) or non volatile (~/.wine). Usage: - ./bin/run.sh [-h] [-i] [-n] [Args...] + ./bin/run.sh [-h] [-i] [-n] [ | ] [Args...] diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 4461e7c..2591a4e 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Wine V 1.0.4 - A. GIBERT - 2025/11/29 +------------------------------------------------------------------------------------------------------------------------------------ + +- Improve run.sh to allow direct call with appl full path in one argument, +- Now use rx3-docker/x11-pulse:1.2.6-mga9 image, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Wine V 1.0.3 - A. GIBERT - 2025/09/19 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/bin/run.sh b/bin/run.sh index d05d16f..48bc98d 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -16,7 +16,7 @@ while [[ "$1" == "-h" || "$1" == "-i" || "$1" == "-n" ]] do if [[ "$1" == "-h" ]] then - echo "usage: run.sh [-h] [-n] [-i] [Args...]" + echo "usage: run.sh [-h] [-n] [-i] [ | ] [Args...]" echo "with -i enabling internet access," echo "with -n enabling non volatile wine directory." @@ -37,11 +37,18 @@ do done -export APPL_DIR="$1" -shift +if [[ -d "$1" ]] +then + export APPL_DIR="$1" + shift -export APPL_NAME="$1" -shift + export APPL_NAME="$1" + shift +else + export APPL_DIR="$( dirname $1)" + export APPL_NAME="./$(basename $1)" + shift +fi diff --git a/env.dist b/env.dist index be6e09e..c93c653 100644 --- a/env.dist +++ b/env.dist @@ -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.3" +APPL_VERSION="1.0.4" 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.5-mga9 - - - - - - - - +docker_service_add WN wine ${ORG_URL_PREFIX} - "Rx3-Docker/Wine" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} x11-pulse 1.2.6-mga9 - - - - - - - -