From: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Date: Mon, 11 Mar 2019 03:24:15 +0000 (-0500)
Subject: fixing CSIT problems bc move to Alpine OS
X-Git-Tag: 1.4.0~43
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=6be302e455460b62865bae6ab23e7e3dc683193b

fixing CSIT problems bc move to Alpine OS

Added some packages to prevent other problems in
scripts, and change the mechanism to wait for mariadb as
it does not work with Alpine.

Change-Id: I5ee51d1fddfbf1e63a912ab268a5cabac8da0515
Issue-ID: POLICY-1577
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
---

diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index dd30a9576..60704431a 100644
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -12,8 +12,9 @@ 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 \
+                                bash coreutils grep findutils \
+                                zip unzip curl \
+                                wget openssh maven jq \
                                 httpie py-pip openjdk8
 
 RUN adduser -S policy -s /bin/bash
diff --git a/packages/docker/src/main/docker/wait-for-port.sh b/packages/docker/src/main/docker/wait-for-port.sh
index 7b6e85262..befebf208 100644
--- a/packages/docker/src/main/docker/wait-for-port.sh
+++ b/packages/docker/src/main/docker/wait-for-port.sh
@@ -29,7 +29,7 @@ host=$1
 port=$2
 
 echo "Waiting for $host port $port open"
-until telnet $host $port </dev/null 2>/dev/null | grep -q '^Connected'; do
+until nc -vz $host $port 2> /dev/null; do
 	sleep 1
 done