X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fdocker%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=c257fd3015eaf3b4bac53a0c2ec3ab76eae609a3;hb=9f774daf0c3e317c9542c9fe4108772006b267a9;hp=dd30a957665092e5a811fd9b56d14b79eb638676;hpb=dab3085222371ba0794a5ab31cee2dcde9054167;p=policy%2Fengine.git diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index dd30a9576..c257fd301 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -1,32 +1,23 @@ -FROM alpine:3.9 +FROM onap/policy-jdk-debian -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 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 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 && \ + apt-get install -y netcat && \ + apt-get install -y cron && \ + mkdir -p /tmp/policy-install ${POLICY_LOGS} && \ + chown policy:policy /tmp/policy-install ${POLICY_LOGS} 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