- 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.
This commit is contained in:
@@ -9,6 +9,7 @@ ARG IMG_NAME
|
|||||||
ARG IMG_NAME_FULL
|
ARG IMG_NAME_FULL
|
||||||
ARG IMG_VERSION
|
ARG IMG_VERSION
|
||||||
ARG IMG_MAINTAINER
|
ARG IMG_MAINTAINER
|
||||||
|
ARG IMG_URL
|
||||||
|
|
||||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
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 \
|
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
||||||
&& urpmi --force guacamole-client \
|
&& urpmi.update -a \
|
||||||
&& echo -e "${GUACAMOLED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/guacamoled \
|
&& urpmi --force guacamole-client \
|
||||||
&& chmod a+x /etc/init.d/guacamoled \
|
&& 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
|
&& ln -s /etc/init.d/guacamoled /etc/rcD.d/S50guacamoled
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ ARG IMG_NAME
|
|||||||
ARG IMG_NAME_FULL
|
ARG IMG_NAME_FULL
|
||||||
ARG IMG_VERSION
|
ARG IMG_VERSION
|
||||||
ARG IMG_MAINTAINER
|
ARG IMG_MAINTAINER
|
||||||
|
ARG IMG_URL
|
||||||
|
|
||||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
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 \
|
&& urpmi --force guacamole-server \
|
||||||
&& echo -e "${GUACD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/guacd.ini
|
&& echo -e "${GUACD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/guacd.ini
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Welcome to Rx3-Docker/Guacamole docker image!
|
|||||||
This project aims to build a Guacamole docker image.
|
This project aims to build a Guacamole docker image.
|
||||||
|
|
||||||
Features:
|
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.
|
- Sync with Guacamole 1.6.0.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,17 @@
|
|||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/Gitea V 1.0.0 - A. GIBERT - 2026/01/11
|
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,
|
||||||
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Guacamole V 1.0.0 - A. GIBERT - 2026/01/11
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Initial release,
|
- 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.
|
- Use guacamole-server 1.6.0 from Rx3 RPM.
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ services:
|
|||||||
IMG_NAME_FULL: ${SV_IMG_NAME_FULL}
|
IMG_NAME_FULL: ${SV_IMG_NAME_FULL}
|
||||||
IMG_VERSION: ${SV_IMG_VERSION}
|
IMG_VERSION: ${SV_IMG_VERSION}
|
||||||
IMG_MAINTAINER: ${APPL_MAINTAINER}
|
IMG_MAINTAINER: ${APPL_MAINTAINER}
|
||||||
|
IMG_URL: ${SV_IMG_URL}
|
||||||
IMG_FROM_URL: ${SV_IMG_FROM_URL}
|
IMG_FROM_URL: ${SV_IMG_FROM_URL}
|
||||||
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@@ -105,6 +106,7 @@ services:
|
|||||||
IMG_NAME_FULL: ${WA_IMG_NAME_FULL}
|
IMG_NAME_FULL: ${WA_IMG_NAME_FULL}
|
||||||
IMG_VERSION: ${WA_IMG_VERSION}
|
IMG_VERSION: ${WA_IMG_VERSION}
|
||||||
IMG_MAINTAINER: ${APPL_MAINTAINER}
|
IMG_MAINTAINER: ${APPL_MAINTAINER}
|
||||||
|
IMG_URL: ${WA_IMG_URL}
|
||||||
IMG_FROM_URL: ${WA_IMG_FROM_URL}
|
IMG_FROM_URL: ${WA_IMG_FROM_URL}
|
||||||
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|||||||
8
env.dist
8
env.dist
@@ -20,7 +20,7 @@ APPL_NAME="guacamole"
|
|||||||
APPL_NAME_FULL="Guacamole Server"
|
APPL_NAME_FULL="Guacamole Server"
|
||||||
APPL_NAME_SHORT="guacml"
|
APPL_NAME_SHORT="guacml"
|
||||||
APPL_ORG="rx3-docker"
|
APPL_ORG="rx3-docker"
|
||||||
APPL_VERSION="1.0.0"
|
APPL_VERSION="1.0.1"
|
||||||
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
|
|
||||||
@@ -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 |
|
# | 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 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.0-mga9 - - 8078 8080 - - 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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user