From 1738c5bf4e46c31557d79bc7f32844efb5e405fc Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Sun, 11 Jan 2026 12:02:03 +0100
Subject: [PATCH] - Add GUACAMOLE_CONTEXT environement variable support.

---
 Dockerfile-client | 12 +++++++++---
 ReleaseNotes.txt  |  2 +-
 compose.yaml      |  2 ++
 env.dist          |  2 ++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Dockerfile-client b/Dockerfile-client
index 55922f3..ca1b457 100644
--- a/Dockerfile-client
+++ b/Dockerfile-client
@@ -15,24 +15,30 @@ LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
 LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
+ARG TOMCAT_WEBAPPS_DIR=/var/lib/tomcat/webapps
+
 ARG GUACAMOLE_LIB_DIR=/var/lib/guacamole
 ARG GUACAMOLE_CONFIG_DIR=/etc/guacamole
 ARG GUACAMOLE_CONFIG_FILE=${GUACAMOLE_CONFIG_DIR}/guacamole.properties
+ARG GUACAMOLE_WEBAPP_FILE=${GUACAMOLE_LIB_DIR}/webapps/guacamole.war
 
 
 
 #--------------------------------------------------------------------------------------------------------------------------------
 ARG GUACAMOLED='#!/bin/bash                                                                                                   \n\
                                                                                                                               \n\
-chown -R root:tomcat '${GUACAMOLE_LIB_DIR}' '${GUACAMOLE_CONFIG_DIR}'                                                         \n\
-                                                                                                                              \n\
 sed -i -e "s/guacd-hostname:        .*/guacd-hostname:        ${GUACD_HOST}/"                      '${GUACAMOLE_CONFIG_FILE}' \n\
 sed -i -e "s/guacd-port:            .*/guacd-port:            ${GUACD_PORT}/"                      '${GUACAMOLE_CONFIG_FILE}' \n\
 sed -i -e "s/postgresql-hostname:   .*/postgresql-hostname:   ${POSTGRESQL_HOST}/"                 '${GUACAMOLE_CONFIG_FILE}' \n\
 sed -i -e "s/postgresql-port:       .*/postgresql-port:       ${POSTGRESQL_PORT}/"                 '${GUACAMOLE_CONFIG_FILE}' \n\
 sed -i -e "s/postgresql-database:   .*/postgresql-database:   ${POSTGRESQL_DATABASE}/"             '${GUACAMOLE_CONFIG_FILE}' \n\
 sed -i -e "s/postgresql-username:   .*/postgresql-username:   ${POSTGRESQL_USER}/"                 '${GUACAMOLE_CONFIG_FILE}' \n\
-sed -i -e "s/postgresql-password:   .*/postgresql-password:   ${POSTGRESQL_PASSWORD}/"             '${GUACAMOLE_CONFIG_FILE}
+sed -i -e "s/postgresql-password:   .*/postgresql-password:   ${POSTGRESQL_PASSWORD}/"             '${GUACAMOLE_CONFIG_FILE}' \n\
+                                                                                                                              \n\
+rm -R '${TOMCAT_WEBAPPS_DIR}'/*                                                                                               \n\
+ln -s '${GUACAMOLE_WEBAPP_FILE}' '${TOMCAT_WEBAPPS_DIR}'/${GUACAMOLE_CONTEXT:-guacamole}.war                                  \n\
+                                                                                                                              \n\
+chown -R root:tomcat '${GUACAMOLE_LIB_DIR}' '${GUACAMOLE_CONFIG_DIR}' '${TOMCAT_WEBAPPS_DIR}
 #--------------------------------------------------------------------------------------------------------------------------------
 
 
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 0b142bf..eb97b03 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,5 +1,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-Rx3-Docker/Gitea V 1.0.0 - A. GIBERT - 2026/01/10
+Rx3-Docker/Gitea V 1.0.0 - A. GIBERT - 2026/01/11
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Initial release,
diff --git a/compose.yaml b/compose.yaml
index c0383ce..ce47bf7 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -121,6 +121,8 @@ services:
       POSTGRESQL_USER:              ${DB_USER}
       POSTGRESQL_PASSWORD:          ${DB_PASSWORD}
 
+      GUACAMOLE_CONTEXT:            ${WA_WEBAPP_CONTEXT}
+
     healthcheck:
         test:                       ["CMD", "curl", "-f", "http://localhost:${WA_PORT_MAIN_INT}/guacamole/"]
         interval:                   10s
diff --git a/env.dist b/env.dist
index 6ed7d59..c459499 100644
--- a/env.dist
+++ b/env.dist
@@ -112,3 +112,5 @@ WA_CROND_ENABLED="FALSE"
 
 WA_LOG_TOMCAT_EXT=./var/log/tomcat
 WA_LOG_TOMCAT_INT=/var/log/tomcat
+
+#WA_WEBAPP_CONTEXT="guacamole"