diff --git a/Dockerfile-client b/Dockerfile-client index 28e41b5..11a808f 100644 --- a/Dockerfile-client +++ b/Dockerfile-client @@ -44,7 +44,7 @@ chown -R root:tomcat '${GUACAMOLE_LIB_DIR}' '${GUACAMOLE_CONFIG_DIR}' '${TOMCAT_ -RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ +RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \ && urpmi.update -a \ && urpmi --force guacamole-client \ && echo -e "${GUACAMOLED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/guacamoled \ diff --git a/Dockerfile-server b/Dockerfile-server index ecf5ed7..e90ffbe 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -25,7 +25,7 @@ command=guacd -b 0.0.0.0 -L info -f' -RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ +RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \ && urpmi.update -a \ && urpmi --force guacamole-server \ && echo -e "${GUACD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/guacd.ini diff --git a/ReadMe.txt b/ReadMe.txt index 7538cae..983f1f1 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3-Docker/Guacamole docker image! This project aims to build a Guacamole docker image. Features: - - Curtently based on rx3-docker/tomcat:1.0.1-mga9, rx3-docker/server:1.3.0-mga9 & rx3-docker/postgresql:1.1.6-mga9 images, + - Curtently based on rx3-docker/server:1.4.0-mga9, rx3-docker/tomcat:1.1.0-mga9 & rx3-docker/postgresql:1.2.0-mga9 images, - Sync with Guacamole 1.6.0. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index c7b501a..bfa88c3 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,9 +1,19 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Guacamole V 1.1.0 - A. GIBERT - 2026/05/30 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3-docker/server:1.4.0-mga9 rx3-docker/tomcat:1.1.0-mga9 & rx3-docker/postgresql:1.2.0-mga9 images, +- Now use docker-tools-1.5.2, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Guacamole V 1.0.1 - A. GIBERT - 2026/02/16 ------------------------------------------------------------------------------------------------------------------------------------ - Add ISL support, -- Use now rx3-docker/tomcat:1.0.1-mga9, rx3-docker/server:1.3.0-mga9 & rx3-docker/postgresql:1.1.6-mga9 images, +- Now use rx3-docker/tomcat:1.0.1-mga9, rx3-docker/server:1.3.0-mga9 & rx3-docker/postgresql:1.1.6-mga9 images, - Rebuild for updates. diff --git a/compose.yaml b/compose.yaml index a43c8d7..e7677d6 100644 --- a/compose.yaml +++ b/compose.yaml @@ -70,7 +70,7 @@ services: GUACAMOLE_GID: ${SV_GROUP_ID} healthcheck: - test: ["CMD-SHELL", "echo > /dev/tcp/localhost/4822 || exit 1"] + test: ["CMD-SHELL", "echo > /dev/tcp/localhost/${SV_PORT_MAIN_INT} || exit 1"] interval: 10s timeout: 3s retries: 3 diff --git a/env.dist b/env.dist index 278c12c..107cd37 100644 --- a/env.dist +++ b/env.dist @@ -7,6 +7,7 @@ ORG_NAME="rx3-docker" ORG_REGISTRY="docker.xor.rx3:5000" +ORG_MAINTAINER='"Arnaud G. GIBERT" ' ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" @@ -20,7 +21,7 @@ APPL_NAME="guacamole" APPL_NAME_FULL="Guacamole Server" APPL_NAME_SHORT="guacml" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.1" +APPL_VERSION="1.1.0" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -76,10 +77,10 @@ DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql" # | 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 DB database ${ORG_URL_PREFIX} postgresql - 1.1.6-mga9 - - - postgres - - 5432 - - postgres postgres +docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.2.0-mga9 - - - postgres - - 5432 - - postgres postgres -docker_service_add SV server ${ORG_URL_PREFIX} guacd "Rx3-Docker/Guacamole Server" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.3.0-mga9 - - - 4822 - - apache apache -docker_service_add WA webapp ${ORG_URL_PREFIX} guacamole "Rx3-Docker/Guacamole Client" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} tomcat 1.0.1-mga9 - - 8078 8080 - - apache apache +docker_service_add SV server ${ORG_URL_PREFIX} guacd "Rx3-Docker/Guacamole Server" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.4.0-mga9 - - - 4822 - - apache apache +docker_service_add WA webapp ${ORG_URL_PREFIX} guacamole "Rx3-Docker/Guacamole Client" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} tomcat 1.1.0-mga9 - - 8078 8080 - - apache apache