Update package before installing

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

diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index 087dcb4..78c927a 100644 (file)
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -1,54 +1,42 @@
-FROM ubuntu:14.04
+FROM onap/policy-jdk-debian
 
-ARG HTTP_PROXY=${HTTP_PROXY}
-ARG HTTPS_PROXY=${HTTPS_PROXY}
-ARG BUILD_VERSION=${BUILD_VERSION}
-ARG POLICY_HOME=/opt/app/policy
+LABEL maintainer="Policy Team"
+
+ARG BUILD_VERSION_DROOLS=${BUILD_VERSION_DROOLS}
 ARG POLICY_LOGS=/var/log/onap/policy/pdpd
 ARG POLICY_INSTALL=/tmp/policy-install
-
-ENV http_proxy $HTTP_PROXY
-ENV https_proxy $HTTPS_PROXY
-ENV BUILD_VERSION ${BUILD_VERSION}
-ENV POLICY_INSTALL ${POLICY_INSTALL}
-ENV POLICY_HOME ${POLICY_HOME}
-ENV POLICY_LOGS ${POLICY_LOGS}
-ENV POLICY_CONFIG ${POLICY_HOME}/config
-ENV POLICY_LOGBACK ${POLICY_CONFIG}/logback.xml
+ARG MVN_SNAPSHOT_REPO_URL
+ARG MVN_RELEASE_REPO_URL
+ARG http_proxy
+
+ENV BUILD_VERSION_DROOLS $BUILD_VERSION_DROOLS
+ENV POLICY_INSTALL $POLICY_INSTALL
+ENV POLICY_INSTALL_INIT $POLICY_INSTALL/config
+ENV POLICY_LOGS $POLICY_LOGS
+ENV POLICY_CONFIG $POLICY_HOME/config
+ENV POLICY_LOGBACK $POLICY_CONFIG/logback.xml
 ENV POLICY_DOCKER true
-
-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 pip install http-prompt
-RUN mkdir -p ${POLICY_HOME}/config ${POLICY_LOGS} ${POLICY_INSTALL}/config && \
-    chown -R policy:policy ${POLICY_HOME} ${POLICY_LOGS} ${POLICY_INSTALL}
-
-WORKDIR ${POLICY_INSTALL}
-
-COPY install-drools.zip docker-install.sh do-start.sh wait-for-port.sh ./
-
-VOLUME [ "${POLICY_INSTALL}/config", "${POLICY_HOME}/config" ]
+ENV MVN_SNAPSHOT_REPO_URL $MVN_SNAPSHOT_REPO_URL
+ENV MVN_RELEASE_REPO_URL $MVN_RELEASE_REPO_URL
+ENV http_proxy $http_proxy
+
+RUN apt-get update \
+    && apt-get install -y \
+    mariadb-client \
+    file \
+    bash-completion \
+    vim \
+    && pip install http-prompt
+
+RUN mkdir -p $POLICY_CONFIG $POLICY_LOGS $POLICY_INSTALL_INIT && \
+    chown -R policy:policy $POLICY_HOME $POLICY_LOGS $POLICY_INSTALL && \
+    rmdir $POLICY_HOME/etc/ssl && \
+    rmdir $POLICY_HOME/etc
+
+WORKDIR $POLICY_INSTALL
+COPY /maven/install-drools.zip docker-install.sh do-start.sh wait-for-port.sh ./
+
+VOLUME [ "$POLICY_INSTALL_INIT" ]
 
 RUN unzip -o install-drools.zip && \
     rm install-drools.zip && \