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 3732e58..1efc072 100644 (file)
--- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
@@ -1,36 +1,24 @@
-FROM alpine:3.9
+FROM onap/policy-common-alpine:1.4.0
 
-ARG HTTP_PROXY=${HTTP_PROXY}
-ARG HTTPS_PROXY=${HTTPS_PROXY}
-ARG BUILD_VERSION=${BUILD_VERSION}
-ARG POLICY_LOGS=/var/log/onap/policy/pdpx
-
-ENV http_proxy $HTTP_PROXY
-ENV https_proxy $HTTPS_PROXY
-ENV BUILD_VERSION ${BUILD_VERSION}
-ENV POLICY_LOGS ${POLICY_LOGS}
+LABEL maintainer="Policy Team"
 
-ENV POLICY_HOME=/opt/app/policy/pdpx
-
-RUN \
-    apk add --no-cache --update busybox-extras bash nss procps coreutils findutils grep \
-                                zip unzip curl wget openssh maven openjdk8 jq httpie py-pip
+ARG POLICY_LOGS=/var/log/onap/policy/pdpx
 
-RUN addgroup policy && \
-    adduser -S --shell /bin/bash -G policy policy
+ENV POLICY_LOGS=$POLICY_LOGS
 
-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}
+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 /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 +x 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" ]