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 df42ca7..1efc072 100644 (file)
--- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
@@ -1,46 +1,24 @@
-FROM ubuntu:16.04
+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
-ENV POLICY_PDPX_HOME=${POLICY_HOME}/pdpx
-
-RUN \
-        apt-get clean && \
-        apt-get update && \
-        apt-get install -y zip unzip curl wget ssh telnet maven && \
-        apt-get install -y software-properties-common && \
-        apt-get install -y jq httpie && \
-        apt-get install -y python-pip && \
-        add-apt-repository ppa:openjdk-r/ppa && \
-        apt-get clean && \
-        apt-get update && \
-        apt-get install -y openjdk-8-jdk
+ARG POLICY_LOGS=/var/log/onap/policy/pdpx
 
-RUN groupadd policy 
-RUN useradd --create-home --shell /bin/bash -g policy policy
+ENV POLICY_LOGS=$POLICY_LOGS
 
-RUN mkdir -p ${POLICY_PDPX_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_PDPX_HOME}/bin && \
-    chown  -R policy:policy ${POLICY_HOME} ${POLICY_PDPX_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_PDPX_HOME}
-RUN rm /packages/policy-xacmlpdp.tar.gz
+RUN tar xvfz /packages/policy-xacmlpdp.tar.gz --directory $POLICY_HOME && \
+    rm /packages/policy-xacmlpdp.tar.gz
 
-WORKDIR ${POLICY_PDPX_HOME}
+WORKDIR $POLICY_HOME
 COPY policy-pdpx.sh  bin/.
-RUN chown -R policy:policy * && chmod +x bin/*.sh
-RUN cp ${POLICY_PDPX_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl && chown policy:policy ${POLICY_HOME}/etc/ssl/*
+RUN chown -R policy:policy * && chmod 755 bin/*.sh && chmod 755 mysql/bin/*.sh
 
 USER policy
-WORKDIR ${POLICY_PDPX_HOME}/bin
+WORKDIR $POLICY_HOME/bin
 ENTRYPOINT [ "bash", "./policy-pdpx.sh" ]