This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new a05c0c2 KNOX-1773 - Docker start gateway/ldap in the foreground
a05c0c2 is described below
commit a05c0c2b8aa71b246ddd239a475e59b27dce15ee
Author: Kevin Risden <[email protected]>
AuthorDate: Mon Feb 11 12:55:55 2019 -0500
KNOX-1773 - Docker start gateway/ldap in the foreground
Signed-off-by: Kevin Risden <[email protected]>
---
gateway-docker/src/main/resources/docker/gateway-entrypoint.sh | 5 ++---
gateway-docker/src/main/resources/docker/ldap-entrypoint.sh | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/gateway-docker/src/main/resources/docker/gateway-entrypoint.sh
b/gateway-docker/src/main/resources/docker/gateway-entrypoint.sh
index a6c32cd..5519e45 100755
--- a/gateway-docker/src/main/resources/docker/gateway-entrypoint.sh
+++ b/gateway-docker/src/main/resources/docker/gateway-entrypoint.sh
@@ -18,9 +18,8 @@
set -e
set -o pipefail
+export GATEWAY_SERVER_RUN_IN_FOREGROUND=true
+
./bin/knoxcli.sh create-master --master knox
./bin/gateway.sh start
-# This is needed because gateway.sh starts in the background
-# Would be better for gateway.sh to have a foreground version
-tail -f ./logs/*
diff --git a/gateway-docker/src/main/resources/docker/ldap-entrypoint.sh
b/gateway-docker/src/main/resources/docker/ldap-entrypoint.sh
index 8da1719..162c130 100755
--- a/gateway-docker/src/main/resources/docker/ldap-entrypoint.sh
+++ b/gateway-docker/src/main/resources/docker/ldap-entrypoint.sh
@@ -18,8 +18,7 @@
set -e
set -o pipefail
+export LDAP_SERVER_RUN_IN_FOREGROUND=true
+
./bin/ldap.sh start
-# This is needed because ldap.sh starts in the background
-# Would be better for ldap.sh to have a foreground version
-tail -f ./logs/*
