From 4b87b6d7bfe6b7a6e9ed97af6c91c8fe4933e48e Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Thu, 29 Mar 2018 00:48:42 -0400 Subject: Update docker entrypoint to run independent Issue-ID: AAI-949 Change-Id: I014e852a518e78c49869c7f71e18a84c853a2b89 Signed-off-by: Kajur, Harish (vk250x) --- aai-traversal/src/main/docker/Dockerfile | 1 - aai-traversal/src/main/docker/docker-entrypoint.sh | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/aai-traversal/src/main/docker/Dockerfile b/aai-traversal/src/main/docker/Dockerfile index 3e4cd77..3d25170 100644 --- a/aai-traversal/src/main/docker/Dockerfile +++ b/aai-traversal/src/main/docker/Dockerfile @@ -8,7 +8,6 @@ WORKDIR /opt/app/aai-traversal # 8446 is the important one to be used EXPOSE 8446 - HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8446 || exit 1 ENTRYPOINT ["/bin/bash", "/opt/app/aai-traversal/docker-entrypoint.sh"] diff --git a/aai-traversal/src/main/docker/docker-entrypoint.sh b/aai-traversal/src/main/docker/docker-entrypoint.sh index 8e52f0b..ea5ac6b 100644 --- a/aai-traversal/src/main/docker/docker-entrypoint.sh +++ b/aai-traversal/src/main/docker/docker-entrypoint.sh @@ -56,6 +56,24 @@ if [ -f ${APP_HOME}/aai.sh ]; then mv ${APP_HOME}/aai.sh /etc/profile.d/aai.sh chmod 755 /etc/profile.d/aai.sh + + scriptName=$1; + + if [ ! -z $scriptName ]; then + + if [ -f ${APP_HOME}/bin/${scriptName} ]; then + shift 1; + gosu aaiadmin ${APP_HOME}/bin/${scriptName} "$@" || { + echo "Failed to run the ${scriptName}"; + exit 1; + } + else + echo "Unable to find the script ${scriptName} in ${APP_HOME}/bin"; + exit 1; + fi; + + exit 0; + fi; fi; if [ -z ${DISABLE_UPDATE_QUERY} ]; then -- cgit 1.2.3-korg