From d0fe049e2575b1192fba6854171637cd6655cd02 Mon Sep 17 00:00:00 2001
From: shaoqiu <tim.huang@est.tech>
Date: Tue, 25 Jun 2019 06:10:52 +0000
Subject: Remove POLICY_API_HOME in Dockerfile

To use POLICY_HOME not POLICY_XXX_HOME

Issue-ID: POLICY-1702
Change-Id: I14e3415f1ee00cd7a82b0d1768eb6c1ab8775424
Signed-off-by: shaoqiu <tim.huang@est.tech>
---
 packages/policy-api-docker/src/main/docker/Dockerfile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'packages/policy-api-docker/src/main/docker/Dockerfile')

diff --git a/packages/policy-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile
index a30f7b39..c9e36d02 100644
--- a/packages/policy-api-docker/src/main/docker/Dockerfile
+++ b/packages/policy-api-docker/src/main/docker/Dockerfile
@@ -4,22 +4,22 @@ LABEL maintainer="Policy Team"
 
 ARG POLICY_LOGS=/var/log/onap/policy/api
 
-ENV POLICY_LOGS ${POLICY_LOGS}
-ENV POLICY_API_HOME=${POLICY_HOME}/api
+ENV POLICY_LOGS=$POLICY_LOGS
+ENV POLICY_HOME=$POLICY_HOME/api
 
-RUN mkdir -p ${POLICY_LOGS} ${POLICY_API_HOME} ${POLICY_API_HOME}/bin && \
-    chown -R policy:policy ${POLICY_API_HOME} ${POLICY_LOGS}
+RUN mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
+    chown -R policy:policy $POLICY_HOME $POLICY_LOGS
 
 RUN mkdir /packages
 COPY /maven/* /packages
-RUN tar xvfz /packages/policy-api.tar.gz --directory ${POLICY_API_HOME} && \
+RUN tar xvfz /packages/policy-api.tar.gz --directory $POLICY_HOME && \
     rm /packages/policy-api.tar.gz
 
-WORKDIR ${POLICY_API_HOME}
+WORKDIR $POLICY_HOME
 COPY policy-api.sh  bin/.
-RUN chown -R policy:policy * && chmod 755 bin/*.sh && \
-    cp ${POLICY_API_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_API_HOME}/bin
+WORKDIR $POLICY_HOME/bin
 ENTRYPOINT [ "bash", "./policy-api.sh" ]
-- 
cgit 1.2.3-korg