Merge "Rebase image on policy-common-alpine"

1 files changed, 5 insertions, 17 deletions

diff --git a/packages/policy-pap-docker/src/main/docker/Dockerfile b/packages/policy-pap-docker/src/main/docker/Dockerfile
index 0870fbf5..4bff78e2 100644
--- a/packages/policy-pap-docker/src/main/docker/Dockerfile
+++ b/packages/policy-pap-docker/src/main/docker/Dockerfile
@@ -1,26 +1,14 @@
-FROM alpine:3.9
+FROM onap/policy-common-alpine:1.4.0
+
+LABEL maintainer="Policy Team"
 
-ARG HTTP_PROXY=${HTTP_PROXY}
-ARG HTTPS_PROXY=${HTTPS_PROXY}
-ARG BUILD_VERSION=${BUILD_VERSION}
 ARG POLICY_LOGS=/var/log/onap/policy/pap
 
-ENV http_proxy $HTTP_PROXY
-ENV https_proxy $HTTPS_PROXY
-ENV BUILD_VERSION ${BUILD_VERSION}
 ENV POLICY_LOGS ${POLICY_LOGS}
-
-ENV POLICY_HOME=/opt/app/policy
 ENV POLICY_PAP_HOME=${POLICY_HOME}/pap
 
-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
-
-RUN addgroup -S policy && \
-    adduser -S --shell /bin/bash -G policy policy
-
-RUN mkdir -p ${POLICY_PAP_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_PAP_HOME}/bin && \
-    chown  -R policy:policy ${POLICY_HOME} ${POLICY_PAP_HOME} ${POLICY_LOGS}
+RUN mkdir -p ${POLICY_PAP_HOME} ${POLICY_LOGS} ${POLICY_PAP_HOME}/bin && \
+    chown  -R policy:policy ${POLICY_PAP_HOME} ${POLICY_LOGS}
 
 RUN mkdir /packages
 COPY /maven/* /packages