From bd61472ab296b56eaf07ec2925cd9430613ab6e2 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 14 Apr 2025 14:24:46 +0200 Subject: [PATCH] - Now use rx3-docker/x11-pulse:1.2.3-mga9 image, - Add absolute & relative command path support, - Add spaces support in Application Dir & Command. --- ReadMe.txt | 2 +- ReleaseNotes.txt | 12 +++++++++++- bin/run.sh | 6 ++++-- env.dist | 4 ++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ReadMe.txt b/ReadMe.txt index cab7014..f8729f8 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ 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.2-mga9 image. + - Curtently based on rx3-docker/x11-pulse:1.2.3-mga9 image. Usage: diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index e7f31f0..49ae2a1 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,6 +1,16 @@ +------------------------------------------------------------------------------------------------------------------------------------ +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. + + + ------------------------------------------------------------------------------------------------------------------------------------ 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. diff --git a/bin/run.sh b/bin/run.sh index c7e1a75..3794cbc 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash set -o errexit @@ -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 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}" "${APPL_NAME}" "$@" docker compose down diff --git a/env.dist b/env.dist index d8fbb6f..cfb4995 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.0" +APPL_VERSION="1.0.1" 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.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 - - - - - - - -