X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fdocker%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=7ef47b42322565bd7f9cc5ee35e42e2948fe4233;hb=05dc6db4c704bfa413e693276517ca0449e69b8c;hp=60704431a85c3dce291acf6113a759f745f16fef;hpb=6be302e455460b62865bae6ab23e7e3dc683193b;p=policy%2Fengine.git diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index 60704431a..7ef47b423 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -1,33 +1,23 @@ -FROM alpine:3.9 +FROM onap/policy-common-alpine:1.4.0 -ARG HTTP_PROXY=${HTTP_PROXY} -ARG HTTPS_PROXY=${HTTPS_PROXY} -ARG BUILD_VERSION=${BUILD_VERSION} +LABEL maintainer="Policy Team" + +ARG BUILD_VERSION_ENGINE=${BUILD_VERSION_ENGINE} ARG POLICY_LOGS=/var/log/onap -ENV http_proxy $HTTP_PROXY -ENV https_proxy $HTTPS_PROXY -ENV BUILD_VERSION ${BUILD_VERSION} +ENV BUILD_VERSION_ENGINE ${BUILD_VERSION_ENGINE} 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 \ - 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} && \ + 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