From ae257d13b8d89da7e599c1ca2b27805d5d10aa93 Mon Sep 17 00:00:00 2001
From: shaoqiu <tim.huang@est.tech>
Date: Mon, 3 Jun 2019 07:08:41 +0000
Subject: Remove POLICY_APEX_PDP_HOME in Dockerfile

To use POLICY_HOME not POLICY_XXX_HOME

Issue-ID: POLICY-1702
Change-Id: I145164f662d2d0fdd94875e8bcacd4f7a669309a
Signed-off-by: shaoqiu <tim.huang@est.tech>
---
 packages/apex-pdp-docker/src/main/docker/Dockerfile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'packages')

diff --git a/packages/apex-pdp-docker/src/main/docker/Dockerfile b/packages/apex-pdp-docker/src/main/docker/Dockerfile
index 802219daa..48018878d 100644
--- a/packages/apex-pdp-docker/src/main/docker/Dockerfile
+++ b/packages/apex-pdp-docker/src/main/docker/Dockerfile
@@ -9,8 +9,7 @@ ARG BUILD_VERSION=${BUILD_VERSION}
 ARG POLICY_LOGS=/var/log/onap/policy/apex-pdp
 
 ENV BUILD_VERSION ${BUILD_VERSION}
-ENV POLICY_HOME=/opt/app/policy
-ENV POLICY_APEX_PDP_HOME=${POLICY_HOME}/apex-pdp
+ENV POLICY_HOME=/opt/app/policy/apex-pdp
 ENV POLICY_LOGS=${POLICY_LOGS}
 
 RUN apk add --no-cache \
@@ -23,25 +22,25 @@ RUN addgroup -S apexuser && adduser -S apexuser -G apexuser
 
 
 # Add Apex-specific directories and set ownership as the Apex admin user
-RUN mkdir -p ${POLICY_APEX_PDP_HOME} \
+RUN mkdir -p ${POLICY_HOME} \
     && mkdir -p ${POLICY_LOGS} \
     && chown -R apexuser:apexuser ${POLICY_LOGS}
 
 # Unpack the tarball
 RUN mkdir /packages
 COPY apex-pdp-package-full.tar.gz /packages
-RUN tar xvfz /packages/apex-pdp-package-full.tar.gz --directory ${POLICY_APEX_PDP_HOME} \
+RUN tar xvfz /packages/apex-pdp-package-full.tar.gz --directory ${POLICY_HOME} \
     && rm /packages/apex-pdp-package-full.tar.gz
 
 # Ensure everything has the correct permissions
 RUN find /opt/app -type d -perm 755 \
     && find /opt/app -type f -perm 644 \
-    && chmod a+x ${POLICY_APEX_PDP_HOME}/bin/*
+    && chmod a+x ${POLICY_HOME}/bin/*
 
 # Copy examples to Apex user area
-RUN cp -pr ${POLICY_APEX_PDP_HOME}/examples /home/apexuser \
+RUN cp -pr ${POLICY_HOME}/examples /home/apexuser \
     && chown -R apexuser:apexuser /home/apexuser/*
 
 USER apexuser
-ENV PATH ${POLICY_APEX_PDP_HOME}/bin:$PATH
+ENV PATH ${POLICY_HOME}/bin:$PATH
 WORKDIR /home/apexuser
-- 
cgit 1.2.3-korg