From 24f5a6edf6086ba9de62a7c4e560e03b394cc185 Mon Sep 17 00:00:00 2001 From: Jean-Benoit PAUX <9682558+jbpaux@users.noreply.github.com> Date: Wed, 27 Apr 2022 15:13:41 +0200 Subject: [PATCH] GUACAMOLE-1572: Revert postgres link name change --- guacamole-docker/README.md | 2 +- guacamole-docker/bin/start.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/guacamole-docker/README.md b/guacamole-docker/README.md index 78631e852..a6e7e1670 100644 --- a/guacamole-docker/README.md +++ b/guacamole-docker/README.md @@ -55,7 +55,7 @@ Deploying Guacamole with PostgreSQL authentication -------------------------------------------------- docker run --name some-guacamole --link some-guacd:guacd \ - --link some-postgresql:postgresql \ + --link some-postgres:postgres \ -e POSTGRESQL_DATABASE=guacamole_db \ -e POSTGRESQL_USER=guacamole_user \ -e POSTGRESQL_PASSWORD=some_password \ diff --git a/guacamole-docker/bin/start.sh b/guacamole-docker/bin/start.sh index c3da02687..e696c379b 100755 --- a/guacamole-docker/bin/start.sh +++ b/guacamole-docker/bin/start.sh @@ -273,9 +273,9 @@ END associate_postgresql() { # Use linked container if specified - if [ -n "$POSTGRESQL_NAME" ]; then - POSTGRESQL_HOSTNAME="$POSTGRESQL_PORT_5432_TCP_ADDR" - POSTGRESQL_PORT="$POSTGRESQL_PORT_5432_TCP_PORT" + if [ -n "$POSTGRES_NAME" ]; then + POSTGRESQL_HOSTNAME="$POSTGRES_PORT_5432_TCP_ADDR" + POSTGRESQL_PORT="$POSTGRES_PORT_5432_TCP_PORT" fi # Use default port if none specified @@ -284,11 +284,11 @@ associate_postgresql() { # Verify required connection information is present if [ -z "$POSTGRESQL_HOSTNAME" -o -z "$POSTGRESQL_PORT" ]; then cat <