safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-99: Support linking Docker container to guacd via GUACD_HOSTNAME and GUACD_PORT environment variables.

Browse Source
This commit is contained in:
Michael Jumper
2016-08-31 22:42:05 -07:00
parent 9240dd82c1
commit c86a94b91a
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
guacamole-docker/bin/start.sh
View File

@@ -352,20 +352,42 @@ mkdir -p "$GUACAMOLE_LIB"
# Point to associated guacd # Point to associated guacd
# #
# Verify required link is present # Use linked container for guacd if specified
if [ -z "$GUACD_PORT_4822_TCP_ADDR" -o -z "$GUACD_PORT_4822_TCP_PORT" ]; then if [ -n "$GUACD_NAME" ]; then
GUACD_HOSTNAME="$GUACD_PORT_4822_TCP_ADDR"
GUACD_PORT="$GUACD_PORT_4822_TCP_PORT"
fi
# Use default guacd port if none specified
GUACD_PORT="${GUACD_PORT-4822}"
# Verify required guacd connection information is present
if [ -z "$GUACD_HOSTNAME" -o -z "$GUACD_PORT" ]; then
cat <<END cat <<END
FATAL: Missing "guacd" link. FATAL: Missing GUACD_HOSTNAME or "guacd" link.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Every Guacamole instance needs a corresponding copy of guacd running. Link a Every Guacamole instance needs a corresponding copy of guacd running. To
container to the link named "guacd" to provide this. provide this, you must either:
(a) Explicitly link that container with the link named "guacd".
(b) If not using a Docker container for guacd, explicitly specify the TCP
connection information using the following environment variables:
GUACD_HOSTNAME The hostname or IP address of guacd. If not using a guacd
Docker container and corresponding link, this environment
variable is *REQUIRED*.
GUACD_PORT The port on which guacd is listening for TCP connections.
This environment variable is optional. If omitted, the
standard guacd port of 4822 will be used.
END END
exit 1; exit 1;
fi fi
# Update config file # Update config file
set_property "guacd-hostname" "$GUACD_PORT_4822_TCP_ADDR" set_property "guacd-hostname" "$GUACD_HOSTNAME"
set_property "guacd-port" "$GUACD_PORT_4822_TCP_PORT" set_property "guacd-port" "$GUACD_PORT"
# #
# Track which authentication backends are installed # Track which authentication backends are installed