From 076ac8f6f147ca3d3b4ed2cf8f3e31855c1b0285 Mon Sep 17 00:00:00 2001
From: Matias <mati108@gmail.com>
Date: Wed, 3 Jul 2019 12:51:43 -0300
Subject: [PATCH] Adding wait for

---
 docker-compose.yml | 30 ++++++++----------
 server/wait-for    | 79 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 16 deletions(-)
 create mode 100644 server/wait-for

diff --git a/docker-compose.yml b/docker-compose.yml
index 7550f56be..ca7c17275 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -82,6 +82,19 @@ services:
     depends_on:
       - mongo
 
+  clones-api:
+    image: superalgos/clones-api:0.1.0
+    restart: always
+    build: ../OperationsModule/server
+    env_file: ./env/clones-api.env
+    command: npm start
+    ports:
+      - "4003:4003"
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo-express
+
   saweb-api:
     image: superalgos/saweb-api:0.1.0
     restart: always
@@ -108,19 +121,6 @@ services:
     depends_on:
       - mongo-express
 
-  clones-api:
-    image: superalgos/clones-api:0.1.0
-    restart: always
-    build: ../OperationsModule/server
-    env_file: ./env/clones-api.env
-    command: npm start
-    ports:
-      - "4003:4003"
-    networks:
-      - superalgos_net
-    depends_on:
-      - mongo-express
-
   cockpit-api:
     image: superalgos/cockpit-api:0.1.0
     restart: always
@@ -239,7 +239,7 @@ services:
     restart: always
     build: ./server
     env_file: ./env/master-app-api.env
-    command: node .
+    command: sh -c './wait-for master-app:3100 -- node .'
     ports:
       - "4100:4100"
     networks:
@@ -257,8 +257,6 @@ services:
       - "4101:4101"
     networks:
       - superalgos_net
-    depends_on:
-      - master-app-api
 
   kubernetes:
     image: qoomon/docker-host:2.2.0
diff --git a/server/wait-for b/server/wait-for
new file mode 100644
index 000000000..539a01d4e
--- /dev/null
+++ b/server/wait-for
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+TIMEOUT=15
+QUIET=0
+
+echoerr() {
+  if [ "$QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi
+}
+
+usage() {
+  exitcode="$1"
+  cat << USAGE >&2
+Usage:
+  $cmdname host:port [-t timeout] [-- command args]
+  -q | --quiet                        Do not output any status messages
+  -t TIMEOUT | --timeout=timeout      Timeout in seconds, zero for no timeout
+  -- COMMAND ARGS                     Execute command with args after the test finishes
+USAGE
+  exit "$exitcode"
+}
+
+wait_for() {
+  for i in `seq $TIMEOUT` ; do
+    nc -z "$HOST" "$PORT" > /dev/null 2>&1
+
+    result=$?
+    if [ $result -eq 0 ] ; then
+      if [ $# -gt 0 ] ; then
+        exec "$@"
+      fi
+      exit 0
+    fi
+    sleep 1
+  done
+  echo "Operation timed out" >&2
+  exit 1
+}
+
+while [ $# -gt 0 ]
+do
+  case "$1" in
+    *:* )
+    HOST=$(printf "%s\n" "$1"| cut -d : -f 1)
+    PORT=$(printf "%s\n" "$1"| cut -d : -f 2)
+    shift 1
+    ;;
+    -q | --quiet)
+    QUIET=1
+    shift 1
+    ;;
+    -t)
+    TIMEOUT="$2"
+    if [ "$TIMEOUT" = "" ]; then break; fi
+    shift 2
+    ;;
+    --timeout=*)
+    TIMEOUT="${1#*=}"
+    shift 1
+    ;;
+    --)
+    shift
+    break
+    ;;
+    --help)
+    usage 0
+    ;;
+    *)
+    echoerr "Unknown argument: $1"
+    usage 1
+    ;;
+  esac
+done
+
+if [ "$HOST" = "" -o "$PORT" = "" ]; then
+  echoerr "Error: you need to provide a host and port to test."
+  usage 2
+fi
+
+wait_for "$@"