Compare commits
1 Commits
guacamole-
...
guacamole-
| Author | SHA1 | Date | |
|---|---|---|---|
| 4e0f8f83e7 |
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
9
env.dist
9
env.dist
@@ -7,6 +7,7 @@
|
||||
|
||||
ORG_NAME="rx3-docker"
|
||||
ORG_REGISTRY="docker.xor.rx3:5000"
|
||||
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
|
||||
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" <arnaud@rx3.net>'
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user