diff options
| author |   shaoqiu <tim.huang@est.tech> | 2019-06-26 04:08:11 +0000 |
|---|---|---|
| committer | shaoqiu <tim.huang@est.tech> | 2019-06-26 04:08:11 +0000 |
| commit | 7c28dfddd22389f87d649f9981d7ddd917088a87 (patch) | |
| tree | 400c55884499a41221447f7ad30c5658a6e76927 /packages/policy-distribution-docker/src/main/docker/policy-dist.sh | |
| parent | 00d6cceb92b2dd60a626406370ea5a1473ee56ca (diff) | |
Remove POLICY_DISTRIBUTION_HOME in Dockerfile
Update the policy-dist.sh and Dockerfile according to the comments in
commit: https://gerrit.onap.org/r/c/policy/api/+/89972
Issue-ID: POLICY-1702
Change-Id: Ia3d2ce356baac3a657da879fb9ccf5eefd2a9624
Signed-off-by: shaoqiu <tim.huang@est.tech>
Diffstat (limited to 'packages/policy-distribution-docker/src/main/docker/policy-dist.sh')
| -rw-r--r-- | packages/policy-distribution-docker/src/main/docker/policy-dist.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh index 63879e3e..4f523b97 100644 --- a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh +++ b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh @@ -2,6 +2,7 @@ # # ============LICENSE_START======================================================= # Copyright (C) 2018 Ericsson. 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. @@ -20,7 +21,6 @@ # JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ -POLICY_DISTRIBUTION_HOME=/opt/app/policy/distribution KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore" @@ -35,9 +35,9 @@ fi if [ -z "$CONFIG_FILE" ] then - CONFIG_FILE="$POLICY_DISTRIBUTION_HOME/etc/defaultConfig.json" + CONFIG_FILE="$POLICY_HOME/etc/defaultConfig.json" fi echo "Policy distribution config file: $CONFIG_FILE" -$JAVA_HOME/bin/java -cp "$POLICY_DISTRIBUTION_HOME/etc:$POLICY_DISTRIBUTION_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.distribution.main.startstop.Main -c $CONFIG_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.distribution.main.startstop.Main -c $CONFIG_FILE |