diff options
Diffstat (limited to 'packages/policy-distribution-docker')
-rw-r--r-- | packages/policy-distribution-docker/pom.xml | 2 | ||||
-rw-r--r-- | packages/policy-distribution-docker/src/main/docker/policy-dist.sh | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/packages/policy-distribution-docker/pom.xml b/packages/policy-distribution-docker/pom.xml index ae0ce979..45a4621d 100644 --- a/packages/policy-distribution-docker/pom.xml +++ b/packages/policy-distribution-docker/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>packages</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> 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 a6366c05..ebb6b8d2 100644 --- a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh +++ b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh @@ -22,10 +22,17 @@ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ POLICY_DISTRIBUTION_HOME=/opt/app/policy/distribution -CONFIG_FILE=$1 +if [ "$#" -eq 1 ]; then + CONFIG_FILE=$1 +else + CONFIG_FILE=${CONFIG_FILE} +fi + if [ -z "$CONFIG_FILE" ] then - CONFIG_FILE=$POLICY_DISTRIBUTION_HOME/etc/defaultConfig.json + CONFIG_FILE="$POLICY_DISTRIBUTION_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/*" org.onap.policy.distribution.main.startstop.Main -c $CONFIG_FILE |