X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fdocker%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=7ef47b42322565bd7f9cc5ee35e42e2948fe4233;hb=05dc6db4c704bfa413e693276517ca0449e69b8c;hp=b7ed904f501eed0e500b2c7fd016097b353a0179;hpb=973929cfd6cd3e5ba3a837fa56d35b210307c9ac;p=policy%2Fengine.git diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index b7ed904f5..7ef47b423 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -1,44 +1,23 @@ -FROM ubuntu:14.04 +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} -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 mkdir -p /opt/app/policy /tmp/policy-install ${POLICY_LOGS} && \ - chown policy /opt/app/policy /tmp/policy-install ${POLICY_LOGS} +RUN apk add --no-cache mariadb-client + +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