aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorshaoqiu <tim.huang@est.tech>2019-06-03 07:08:41 +0000
committershaoqiu <tim.huang@est.tech>2019-06-03 07:08:41 +0000
commitae257d13b8d89da7e599c1ca2b27805d5d10aa93 (patch)
tree34d921ce66dd3ac32d9e4566060171e4a7f84d16 /packages
parenta9a3a5d23130bdd652da64d0297cf00081b085d7 (diff)
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>
Diffstat (limited to 'packages')
-rw-r--r--packages/apex-pdp-docker/src/main/docker/Dockerfile13
1 files changed, 6 insertions, 7 deletions
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