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 587e784..78c927a 100644 (file)
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -1,41 +1,42 @@
-FROM alpine:3.9
+FROM onap/policy-jdk-debian
 
-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 BUILD_VERSION ${BUILD_VERSION}
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-
-ENV POLICY_INSTALL ${POLICY_INSTALL}
-ENV POLICY_INSTALL_INIT ${POLICY_INSTALL}/config
-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 apk --update add --no-cache busybox-extras \
-                                bash coreutils grep findutils \
-                                zip unzip curl \
-                                wget openssh  maven jq \
-                                httpie py-pip openjdk8
-
-RUN addgroup -S policy && adduser -S policy -s /bin/bash
-
-# install MariaDB client
-RUN apk --update add --no-cache mariadb-client
-
-RUN pip install http-prompt
-RUN mkdir -p ${POLICY_HOME}/config ${POLICY_LOGS} ${POLICY_INSTALL_INIT} && \
-    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_INIT}" ]
+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 && \