From d848416090efd6850ab25011d8518b15525a1bdb Mon Sep 17 00:00:00 2001 From: shaoqiu Date: Fri, 28 Jun 2019 05:02:39 +0000 Subject: Remove POLICY_PAP_HOME in Dockerfile To use POLICY_HOME not POLICY_XX_HOME Issue-ID: POLICY-1702 Change-Id: I87db84593c2fec3071571b1a0e09552c764a3474 Signed-off-by: shaoqiu --- packages/policy-pap-docker/src/main/docker/policy-pap.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'packages/policy-pap-docker/src/main/docker/policy-pap.sh') diff --git a/packages/policy-pap-docker/src/main/docker/policy-pap.sh b/packages/policy-pap-docker/src/main/docker/policy-pap.sh index f72a5b50..c313d6dd 100644 --- a/packages/policy-pap-docker/src/main/docker/policy-pap.sh +++ b/packages/policy-pap-docker/src/main/docker/policy-pap.sh @@ -21,7 +21,6 @@ # JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ -POLICY_PAP_HOME=/opt/app/policy/pap KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore" @@ -42,15 +41,15 @@ fi if [ -z "$CONFIG_FILE" ] then - CONFIG_FILE="$POLICY_PAP_HOME/etc/defaultConfig.json" + CONFIG_FILE="${POLICY_HOME}/etc/defaultConfig.json" fi if [ -z "$PROP_FILE" ] then - PROP_FILE="$POLICY_PAP_HOME/etc/topic.properties" + PROP_FILE="${POLICY_HOME}/etc/topic.properties" fi echo "Policy pap config file: $CONFIG_FILE" echo "Policy pap property file: $PROP_FILE" -$JAVA_HOME/bin/java -cp "$POLICY_PAP_HOME/etc:$POLICY_PAP_HOME/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.pap.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE +$JAVA_HOME/bin/java -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.pap.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE -- cgit 1.2.3-korg