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

GUACAMOLE-1572: Revert postgres link name change

Browse Source
This commit is contained in:
Jean-Benoit PAUX
2022-04-27 15:13:41 +02:00
committed by Mike Jumper
parent 5f75ebdb5a
commit 24f5a6edf6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole-docker/README.md
View File

@@ -55,7 +55,7 @@ Deploying Guacamole with PostgreSQL authentication
-------------------------------------------------- --------------------------------------------------
docker run --name some-guacamole --link some-guacd:guacd \ docker run --name some-guacamole --link some-guacd:guacd \
--link some-postgresql:postgresql \ --link some-postgres:postgres \
-e POSTGRESQL_DATABASE=guacamole_db \ -e POSTGRESQL_DATABASE=guacamole_db \
-e POSTGRESQL_USER=guacamole_user \ -e POSTGRESQL_USER=guacamole_user \
-e POSTGRESQL_PASSWORD=some_password \ -e POSTGRESQL_PASSWORD=some_password \

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

@@ -273,9 +273,9 @@ END
associate_postgresql() { associate_postgresql() {
# Use linked container if specified # Use linked container if specified
if [ -n "$POSTGRESQL_NAME" ]; then if [ -n "$POSTGRES_NAME" ]; then
POSTGRESQL_HOSTNAME="$POSTGRESQL_PORT_5432_TCP_ADDR" POSTGRESQL_HOSTNAME="$POSTGRES_PORT_5432_TCP_ADDR"
POSTGRESQL_PORT="$POSTGRESQL_PORT_5432_TCP_PORT" POSTGRESQL_PORT="$POSTGRES_PORT_5432_TCP_PORT"
fi fi
# Use default port if none specified # Use default port if none specified
@@ -284,11 +284,11 @@ associate_postgresql() {
# Verify required connection information is present # Verify required connection information is present
if [ -z "$POSTGRESQL_HOSTNAME" -o -z "$POSTGRESQL_PORT" ]; then if [ -z "$POSTGRESQL_HOSTNAME" -o -z "$POSTGRESQL_PORT" ]; then
cat <<END cat <<END
FATAL: Missing POSTGRESQL_HOSTNAME or "postgresql" link. FATAL: Missing POSTGRESQL_HOSTNAME or "postgres" link.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
If using a PostgreSQL database, you must either: If using a PostgreSQL database, you must either:
(a) Explicitly link that container with the link named "postgresql". (a) Explicitly link that container with the link named "postgres".
(b) If not using a Docker container for PostgreSQL, explicitly specify the TCP (b) If not using a Docker container for PostgreSQL, explicitly specify the TCP
connection to your database using the following environment variables: connection to your database using the following environment variables: