X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fdocker%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=580beccb617fc377eafa91e4b43c5f550e9eadc9;hb=e37f5a70bcf3fd8073418c13416cc79c0ef47d59;hp=c6536c815a7f60113f30c921597951ef959ea6cd;hpb=5805752884388261d7183e88a8ae633ebf3a46d6;p=policy%2Fengine.git

diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index c6536c815..580beccb6 100644
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -1,42 +1,23 @@
-FROM ubuntu:14.04
+FROM onap/policy-jdk-debian
 
-ARG HTTP_PROXY=${HTTP_PROXY}
-ARG HTTPS_PROXY=${HTTPS_PROXY}
-ARG POLICY_LOGS=/var/log/ONAP/policy
+LABEL maintainer="Policy Team"
 
-ENV http_proxy $HTTP_PROXY
-ENV https_proxy $HTTPS_PROXY
+ARG BUILD_VERSION_ENGINE=${BUILD_VERSION_ENGINE}
+ARG POLICY_LOGS=/var/log/onap
+
+ENV BUILD_VERSION_ENGINE ${BUILD_VERSION_ENGINE}
 ENV POLICY_LOGS ${POLICY_LOGS}
 
-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
-
-RUN useradd --create-home --shell /bin/bash policy
-
-# install MariaDB client
-RUN \
-    apt-get install -y apt-transport-https && \
-        apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
-        add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu trusty main' && \
-        apt-get clean && \
-        apt-get update && \
-        apt-get install -y mariadb-client
-
-RUN mkdir -p /opt/app/policy /tmp/policy-install ${POLICY_LOGS} && \
-    chown policy /opt/app/policy /tmp/policy-install ${POLICY_LOGS}
+RUN apt update && \
+    apt-get install -y mariadb-client && \
+    mkdir -p /tmp/policy-install ${POLICY_LOGS} && \
+    chown policy:policy /tmp/policy-install ${POLICY_LOGS} && \
+    rmdir ${POLICY_HOME}/etc/ssl && \
+    rmdir ${POLICY_HOME}/etc
 
 WORKDIR /tmp/policy-install
 
-COPY install.zip docker-install.sh do-start.sh wait-for-port.sh ./
+COPY /maven/install.zip docker-install.sh do-start.sh wait-for-port.sh ./
 RUN unzip install.zip && rm install.zip && chown policy * && chmod +x *.sh
 
 USER policy