Repository: incubator-guacamole-client Updated Branches: refs/heads/master 1b26600ca -> ea5c8c546
GUACAMOLE-281: Consider template GUACAMOLE_HOME in Docker image configuration sanity checks. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/1207d8d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/1207d8d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/1207d8d1 Branch: refs/heads/master Commit: 1207d8d1dc843029567e687a24c08ffb34be2182 Parents: 1c0ee41 Author: Michael Jumper <[email protected]> Authored: Sat May 6 12:02:41 2017 -0700 Committer: Michael Jumper <[email protected]> Committed: Sat May 6 12:02:41 2017 -0700 ---------------------------------------------------------------------- guacamole-docker/bin/start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1207d8d1/guacamole-docker/bin/start.sh ---------------------------------------------------------------------- diff --git a/guacamole-docker/bin/start.sh b/guacamole-docker/bin/start.sh index 1801f83..6309265 100755 --- a/guacamole-docker/bin/start.sh +++ b/guacamole-docker/bin/start.sh @@ -427,7 +427,7 @@ fi # Validate that at least one authentication backend is installed # -if [ -z "$INSTALLED_AUTH" ]; then +if [ -z "$INSTALLED_AUTH" -a -z "$GUACAMOLE_HOME_TEMPLATE" ]; then cat <<END FATAL: No authentication configured ------------------------------------------------------------------------------- @@ -435,7 +435,7 @@ The Guacamole Docker container needs at least one authentication mechanism in order to function, such as a MySQL database, PostgreSQL database, or LDAP directory. Please specify at least the MYSQL_DATABASE or POSTGRES_DATABASE environment variables, or check Guacamole's Docker documentation regarding -configuring LDAP. +configuring LDAP and/or custom extensions. END exit 1; fi
