Remove POLICY_PDPX_HOME in policy-pdpx.sh and Dockerfile

[policy/xacml-pdp.git] / packages / policy-xacmlpdp-docker / src / main / docker / Dockerfile

diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
index 0f64e0e..1efc072 100644 (file)
--- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
@@ -4,21 +4,21 @@ LABEL maintainer="Policy Team"
 
 ARG POLICY_LOGS=/var/log/onap/policy/pdpx
 
-ENV POLICY_LOGS ${POLICY_LOGS}
+ENV POLICY_LOGS=$POLICY_LOGS
 
-ENV POLICY_HOME=/opt/app/policy/pdpx
+ENV POLICY_HOME=$POLICY_HOME/pdpx
 RUN apk add --no-cache mariadb-client
-RUN mkdir -p ${POLICY_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_HOME}/bin ${POLICY_HOME}/apps && \
-    chown -R policy:policy ${POLICY_HOME} ${POLICY_LOGS} && mkdir /packages
+RUN mkdir -p $POLICY_HOME $POLICY_LOGS $POLICY_HOME/etc/ssl $POLICY_HOME/bin $POLICY_HOME/apps && \
+    chown -R policy:policy $POLICY_HOME $POLICY_LOGS && mkdir /packages
 
 COPY /maven/* /packages
-RUN tar xvfz /packages/policy-xacmlpdp.tar.gz --directory ${POLICY_HOME} && \
+RUN tar xvfz /packages/policy-xacmlpdp.tar.gz --directory $POLICY_HOME && \
     rm /packages/policy-xacmlpdp.tar.gz
 
-WORKDIR ${POLICY_HOME}
+WORKDIR $POLICY_HOME
 COPY policy-pdpx.sh  bin/.
-RUN chown -R policy:policy * && chmod 755 bin/*.sh
+RUN chown -R policy:policy * && chmod 755 bin/*.sh && chmod 755 mysql/bin/*.sh
 
 USER policy
-WORKDIR ${POLICY_HOME}/bin
+WORKDIR $POLICY_HOME/bin
 ENTRYPOINT [ "bash", "./policy-pdpx.sh" ]