diff options
| author |   Jorge Hernandez <jorge.hernandez-herrero@att.com> | 2019-03-10 22:24:15 -0500 |
|---|---|---|
| committer | Jorge Hernandez <jorge.hernandez-herrero@att.com> | 2019-03-10 22:24:15 -0500 |
| commit | 6be302e455460b62865bae6ab23e7e3dc683193b (patch) | |
| tree | dd9db6e3bbf9f3250727be0fcd1fa0385717b80a | |
| parent | dab3085222371ba0794a5ab31cee2dcde9054167 (diff) | |
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>
| -rw-r--r-- | packages/docker/src/main/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/wait-for-port.sh | 2 |
2 files changed, 4 insertions, 3 deletions
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 |