diff options
| author |   mmis <michael.morris@ericsson.com> | 2018-03-05 13:45:40 +0000 |
|---|---|---|
| committer | mmis <michael.morris@ericsson.com> | 2018-03-05 17:58:33 +0000 |
| commit | f38fbe7b9ee441e446e50f904c50aaa3abb526f5 (patch) | |
| tree | 6a4693bdc2f880c162ef53893f32c0466305ca19 /packages/docker | |
| parent | 87102d3e68569b81709633935dbd31070ce24a8b (diff) | |
Update Dockerfile and docker_*.sh
Correction to previous commit "Move docker_*.sh scripts into
policy/engine" as attempt to build docker image will result in failure to
pull the policy-base image from nexus
The policy-base and policy-os images are removed in favour of including
the contents of those images directly in the policy-pe image
Issue-ID: POLICY-624
Change-Id: Ie4a12407d4cb5a1d663cd11136c282a53f496ca3
Signed-off-by: mmis <michael.morris@ericsson.com>
Diffstat (limited to 'packages/docker')
| -rw-r--r-- | packages/docker/src/main/docker/Dockerfile | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index fe568082d..b0e8205a6 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -1,4 +1,33 @@ -FROM onap/policy/policy-base +FROM ubuntu:14.04 + +ARG HTTP_PROXY=${HTTP_PROXY} +ARG HTTPS_PROXY=${HTTPS_PROXY} + +ENV http_proxy $HTTP_PROXY +ENV https_proxy $HTTPS_PROXY + +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 && chown policy /opt/app/policy /tmp/policy-install |