From e572b590bfe254a1bbccf70b567580b72802f656 Mon Sep 17 00:00:00 2001 From: Krzysztof Kwiecien Date: Tue, 8 Aug 2017 11:44:36 +0200 Subject: [PATCH] correct feature install procedure in docker/drools change FEATURES_HOME variable assigment to allow feature install (including healthcheck feature) in docker image, change credential to be in line with robot Issue: POLICY-145 Change-Id: Ib7640e3947dab280f368531b693dc26e09fa6f21 Signed-off-by: Krzysztof Kwiecien --- .gitignore | 2 ++ config/drools/feature-healthcheck.conf | 2 +- policy-drools/docker-install.sh | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 84421f84..1c47ce99 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ .project .settings target +install.log* +policy-drools/install.log* diff --git a/config/drools/feature-healthcheck.conf b/config/drools/feature-healthcheck.conf index 3351b78f..31baed21 100644 --- a/config/drools/feature-healthcheck.conf +++ b/config/drools/feature-healthcheck.conf @@ -1,2 +1,2 @@ HEALTHCHECK_USER=healthcheck -HEALTHCHECK_PASSWORD=zb!XztG3 +HEALTHCHECK_PASSWORD=zb!XztG34 diff --git a/policy-drools/docker-install.sh b/policy-drools/docker-install.sh index aaa3d10d..8f5fbe4e 100644 --- a/policy-drools/docker-install.sh +++ b/policy-drools/docker-install.sh @@ -822,6 +822,8 @@ function installFeatures fi local name featureConf + export FEATURES_HOME="${POLICY_HOME}/${FEATURES_DIR}" + echo "FEATURES_HOME is ${FEATURES_HOME}" mkdir -p "${FEATURES_HOME}" > /dev/null 2>&1 if [[ -d "${FEATURES_HOME}" && -x "${FEATURES_HOME}" ]]; then @@ -891,6 +893,6 @@ LOGFILE=$PWD/install.log.$TIMESTAMP OPERATION=install BASE_CONF=base.conf HOME_M2=$HOME/.m2 -FEATURES_HOME="${POLICY_HOME}/features" +FEATURES_DIR="features" do_install 2>&1 | tee $LOGFILE -- 2.16.6