diff options
| author |   shaoqiu <tim.huang@est.tech> | 2019-06-28 05:03:09 +0000 |
|---|---|---|
| committer | shaoqiu <tim.huang@est.tech> | 2019-06-28 05:03:09 +0000 |
| commit | 3b6306da48d3776ba5daf5cc50834ef4ad49009b (patch) | |
| tree | 0e143b3e16ab14f8d1c0aa113a39b6d791773eb9 /packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh | |
| parent | 0745cb98e27e14abded0b09746e0252b78762b57 (diff) | |
Remove POLICY_PDPX_HOME in policy-pdpx.sh and Dockerfile
Update the policy-pdpx.sh and Dockerfile according to the comments in
commit: https://gerrit.onap.org/r/c/policy/api/+/89972
Issue-ID: POLICY-1702
Change-Id: Id46c108f5893d3e81e2038d9d5063b9f8a5eb5ee
Signed-off-by: shaoqiu <tim.huang@est.tech>
Diffstat (limited to 'packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh')
| -rw-r--r-- | packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh index f27d65d2..5ffe202a 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh +++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh @@ -2,6 +2,7 @@ # # ============LICENSE_START======================================================= # Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2019 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +20,6 @@ # ============LICENSE_END========================================================= # JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ -POLICY_PDPX_HOME=/opt/app/policy/pdpx KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore" @@ -40,12 +40,12 @@ fi if [ -z "$CONFIG_FILE" ] then - CONFIG_FILE="$POLICY_PDPX_HOME/etc/defaultConfig.json" + CONFIG_FILE="${POLICY_HOME}/etc/defaultConfig.json" fi if [ -z "$PROP_FILE" ] then - PROP_FILE="$POLICY_PDPX_HOME/etc/topic.properties" + PROP_FILE="${POLICY_HOME}/etc/topic.properties" fi if [[ -f ${POLICY_HOME}/etc/mounted/xacml.properties ]]; then @@ -58,4 +58,4 @@ ${POLICY_HOME}/mysql/bin/create-guard-table.sh echo "Policy Xacml PDP config file: $CONFIG_FILE" echo "Policy Xacml PDP topic properties file: $PROP_FILE" -$JAVA_HOME/bin/java -cp "$POLICY_PDPX_HOME/etc:$POLICY_PDPX_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.pdpx.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE
\ No newline at end of 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.pdpx.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE
\ No newline at end of file |