diff --git a/Dockerfile-client b/Dockerfile-client index ca1b457..28e41b5 100644 --- a/Dockerfile-client +++ b/Dockerfile-client @@ -9,6 +9,7 @@ ARG IMG_NAME ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER +ARG IMG_URL LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} @@ -43,9 +44,10 @@ chown -R root:tomcat '${GUACAMOLE_LIB_DIR}' '${GUACAMOLE_CONFIG_DIR}' '${TOMCAT_ -RUN urpmi.update -a \ - && urpmi --force guacamole-client \ - && echo -e "${GUACAMOLED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/guacamoled \ - && chmod a+x /etc/init.d/guacamoled \ +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 \ + && chmod a+x /etc/init.d/guacamoled \ && ln -s /etc/init.d/guacamoled /etc/rcD.d/S50guacamoled diff --git a/Dockerfile-server b/Dockerfile-server index b907139..ecf5ed7 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -9,6 +9,7 @@ ARG IMG_NAME ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER +ARG IMG_URL LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} @@ -24,6 +25,7 @@ command=guacd -b 0.0.0.0 -L info -f' -RUN urpmi.update -a \ +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 5930f21..7538cae 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.0-mga9 & rx3-docker/postgresql:1.1.5-mga9 images, + - 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, - Sync with Guacamole 1.6.0. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index eb97b03..e262a8e 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,7 +1,17 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Gitea V 1.0.1 - A. GIBERT - 2026/02/15 +------------------------------------------------------------------------------------------------------------------------------------ + +- 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, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Gitea V 1.0.0 - A. GIBERT - 2026/01/11 ------------------------------------------------------------------------------------------------------------------------------------ - Initial release, -- Based on rx3-docker/tomcat:1.0.0-mga9 & rx3-docker/postgresql:1.1.5-mga9 images. +- Based on rx3-docker/tomcat:1.0.0-mga9, rx3-docker/server-1.2.7-mga9 & rx3-docker/postgresql:1.1.5-mga9 images, - Use guacamole-server 1.6.0 from Rx3 RPM. diff --git a/compose.yaml b/compose.yaml index fa780db..a43c8d7 100644 --- a/compose.yaml +++ b/compose.yaml @@ -59,6 +59,7 @@ services: IMG_NAME_FULL: ${SV_IMG_NAME_FULL} IMG_VERSION: ${SV_IMG_VERSION} IMG_MAINTAINER: ${APPL_MAINTAINER} + IMG_URL: ${SV_IMG_URL} IMG_FROM_URL: ${SV_IMG_FROM_URL} restart: unless-stopped @@ -105,6 +106,7 @@ services: IMG_NAME_FULL: ${WA_IMG_NAME_FULL} IMG_VERSION: ${WA_IMG_VERSION} IMG_MAINTAINER: ${APPL_MAINTAINER} + IMG_URL: ${WA_IMG_URL} IMG_FROM_URL: ${WA_IMG_FROM_URL} restart: unless-stopped diff --git a/env.dist b/env.dist index baa5cd0..278c12c 100644 --- a/env.dist +++ b/env.dist @@ -20,7 +20,7 @@ APPL_NAME="guacamole" APPL_NAME_FULL="Guacamole Server" APPL_NAME_SHORT="guacml" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.0" +APPL_VERSION="1.0.1" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -76,10 +76,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.5-mga9 - - - postgres - - 5432 - - postgres postgres +docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.1.6-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.2.7-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.0-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.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