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>

diff --git a/packages/policy-distribution-docker/src/main/docker/Dockerfile b/packages/policy-distribution-docker/src/main/docker/Dockerfile
index db26c16..54d268c 100644 (file)
--- a/packages/policy-distribution-docker/src/main/docker/Dockerfile
+++ b/packages/policy-distribution-docker/src/main/docker/Dockerfile
@@ -4,23 +4,21 @@ LABEL maintainer="Policy Team"
 
 ARG POLICY_LOGS=/var/log/onap/policy/distribution
 
-ENV POLICY_LOGS ${POLICY_LOGS}
-ENV POLICY_DISTRIBUTION_HOME=${POLICY_HOME}/distribution
+ENV POLICY_LOGS=$POLICY_LOGS
+ENV POLICY_HOME=$POLICY_HOME/distribution
 
-RUN mkdir -p ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} ${POLICY_DISTRIBUTION_HOME}/bin && \
-    chown -R policy:policy ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS}
+RUN mkdir -p $POLICY_HOME $POLICY_LOGS $POLICY_HOME/bin && \
+    chown -R policy:policy $POLICY_HOME $POLICY_LOGS
 
 RUN mkdir /packages
 COPY /maven/* /packages
-RUN tar xvfz /packages/policy-distribution.tar.gz --directory ${POLICY_DISTRIBUTION_HOME} \
+RUN tar xvfz /packages/policy-distribution.tar.gz --directory $POLICY_HOME \
      && rm /packages/policy-distribution.tar.gz
 
-WORKDIR ${POLICY_DISTRIBUTION_HOME}
+WORKDIR $POLICY_HOME
 COPY policy-dist.sh  bin/.
-RUN chown -R policy:policy * && chmod +x bin/*.sh \
-   && cp ${POLICY_DISTRIBUTION_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl \
-   && chown policy:policy ${POLICY_HOME}/etc/ssl/*
+RUN chown -R policy:policy * && chmod 755 bin/*.sh
 
 USER policy
-WORKDIR ${POLICY_DISTRIBUTION_HOME}/bin
+WORKDIR $POLICY_HOME/bin
 ENTRYPOINT [ "bash", "./policy-dist.sh" ]

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 63879e3..4f523b9 100644 (file)
--- 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