aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmis <michael.morris@ericsson.com>2018-03-05 18:05:19 +0000
committermmis <michael.morris@ericsson.com>2018-03-05 18:09:01 +0000
commit94ec4e0f8c21b2233d00c8800f49ea67eebbd76e (patch)
treecd7046f9782eda8ae2d5f4939e188dbc572cce53
parent824a75e860373d1b244b517842d7c363f0f95d1f (diff)
Update Dockerfile to remove policy-base, policy-os
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-651 Change-Id: I46f4ac0d529fc95ea702809eee466af3d1121717 Signed-off-by: mmis <michael.morris@ericsson.com>
-rw-r--r--packages/docker/src/main/docker/Dockerfile31
1 files changed, 30 insertions, 1 deletions
diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index d4cd77b8..a455f13c 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 pip install http-prompt
RUN mkdir -p /opt/app/policy/opt /tmp/policy-install && \