From: Jorge Hernandez <jh1730@att.com>
Date: Mon, 5 Mar 2018 18:23:34 +0000 (+0000)
Subject: Merge "Update Dockerfile and docker_*.sh"
X-Git-Tag: v1.2.0~96
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b0b3c8fd20176ff13b36f62d5d6ddca42a9e1ddb;hp=1e48f43d43382f444d1401be8130eea9bbc6cddc;p=policy%2Fengine.git

Merge "Update Dockerfile and docker_*.sh"
---

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