From b38e59b1f797b15d0a3e1170e43a0db92216bbd0 Mon Sep 17 00:00:00 2001 From: Dmitry Puzikov Date: Mon, 25 Mar 2019 15:59:53 +0100 Subject: [PATCH] Rebase image on policy-common-alpine Fix notes. Issue-ID: INT-1001 Change-Id: I91c2af3e16032078561e8b0bd5aa4250d449d8d6 Signed-off-by: Dmitry Puzikov --- packages/docker/src/main/docker/Dockerfile | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index 70c816694..66aff075e 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -1,29 +1,15 @@ -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 -ENV http_proxy $HTTP_PROXY -ENV https_proxy $HTTPS_PROXY -ENV BUILD_VERSION ${BUILD_VERSION} ENV POLICY_LOGS ${POLICY_LOGS} -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk - -RUN apk --update add --no-cache busybox-extras \ - bash coreutils grep findutils \ - nss procps zip unzip curl \ - wget openssh maven jq \ - httpie py-pip openjdk8 - -RUN adduser -S policy -s /bin/bash -# install MariaDB client -RUN apk --update add --no-cache mariadb-client +RUN apk add --no-cache mariadb-client -RUN mkdir -p /opt/app/policy /tmp/policy-install ${POLICY_LOGS} && \ - chown policy /opt/app/policy /tmp/policy-install ${POLICY_LOGS} +RUN mkdir -p /tmp/policy-install ${POLICY_LOGS} && \ + chown policy:policy /tmp/policy-install ${POLICY_LOGS} WORKDIR /tmp/policy-install -- 2.16.6