From b463dea010cd15c577f837028e339c3cdb395973 Mon Sep 17 00:00:00 2001
From: OscarSotoSanchez <oscarsotosanchez@gmail.com>
Date: Fri, 8 May 2020 12:25:03 +0200
Subject: [PATCH] updated docker-compose 2.14.0-beta1

---
 .../docker-compose.yml                        |  4 +--
 .../docker/openvidu-proxy/entrypoint.sh       | 12 ++++---
 .../docker/openvidu-server-pro/entrypoint.sh  | 36 -------------------
 3 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml b/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml
index 347a3b27..cb44c0db 100644
--- a/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml
+++ b/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml
@@ -20,7 +20,7 @@ version: '3.1'
 services:
 
     openvidu-server:
-        image: openvidu/openvidu-server:2.13.0
+        image: openvidu/openvidu-server:2.14.0-beta1
         restart: on-failure
         network_mode: host
         entrypoint: ['/bin/bash', '-c', 'export COTURN_IP=`/usr/local/bin/discover_my_public_ip.sh`; /usr/local/bin/entrypoint.sh']
@@ -69,7 +69,7 @@ services:
             - MAX_PORT=65535
 
     nginx:
-        image: openvidu/openvidu-proxy:2.0.0-beta3
+        image: openvidu/openvidu-proxy:2.0.0-beta4
         restart: on-failure
         network_mode: host
         volumes:
diff --git a/openvidu-server/docker/openvidu-proxy/entrypoint.sh b/openvidu-server/docker/openvidu-proxy/entrypoint.sh
index c7027817..63047a9b 100755
--- a/openvidu-server/docker/openvidu-proxy/entrypoint.sh
+++ b/openvidu-server/docker/openvidu-proxy/entrypoint.sh
@@ -29,6 +29,8 @@ CERTIFICATES_CONF="${CERTIFICATES_FOLDER}/certificates.conf"
 [ ! -f "${CERTIFICATES_CONF}" ] && touch "${CERTIFICATES_CONF}"
 [ -z "${PROXY_HTTP_PORT}" ] && export PROXY_HTTP_PORT=80
 [ -z "${PROXY_HTTPS_PORT}" ] && export PROXY_HTTPS_PORT=443
+[ -z "${WITH_APP}" ] && export WITH_APP=true
+[ -z "${PROXY_MODE}" ] && export PROXY_MODE=CE
 [ -z "${ALLOWED_ACCESS_TO_DASHBOARD}" ] && export ALLOWED_ACCESS_TO_DASHBOARD=all
 [ -z "${ALLOWED_ACCESS_TO_RESTAPI}" ] && export ALLOWED_ACCESS_TO_RESTAPI=all
 
@@ -51,8 +53,8 @@ printf "\n  Config Openvidu Application:"
 printf "\n    - Domain name: %s" "${DOMAIN_OR_PUBLIC_IP}"
 printf "\n    - Certificated: %s" "${CERTIFICATE_TYPE}"
 printf "\n    - Letsencrypt Email: %s" "${LETSENCRYPT_EMAIL}"
-printf "\n    - Openvidu Application: %s" "${WITH_APP:-true}"
-printf "\n    - Openvidu Application Type: %s" "${PROXY_MODE:-CE}"
+printf "\n    - Openvidu Application: %s" "${WITH_APP}"
+printf "\n    - Openvidu Application Type: %s" "${PROXY_MODE}"
 
 printf "\n"
 printf "\n  ======================================="
@@ -298,10 +300,10 @@ if [ "${RULES_RESTAPI}" != "allow all;" ]; then
     RULES_RESTAPI="${RULES_RESTAPI}{new_line}allow $PUBLIC_IP;"
   fi
 
-  if ! echo "${RULES_DASHBOARD}" | grep -q "127.0.0.1"; then
-    RULES_DASHBOARD="${RULES_DASHBOARD}{new_line}allow 127.0.0.1;"
+  if ! echo "${RULES_RESTAPI}" | grep -q "127.0.0.1"; then
+    RULES_RESTAPI="${RULES_RESTAPI}{new_line}allow 127.0.0.1;"
   fi
-  
+
   IFS=$'\n'
   for IP in ${LOCAL_NETWORKS}
   do
diff --git a/openvidu-server/docker/openvidu-server-pro/entrypoint.sh b/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
index e9887ec9..b4cb4411 100755
--- a/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
+++ b/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
@@ -23,42 +23,6 @@ if [ ! -z "${WAIT_KIBANA_URL}" ]; then
   done
 fi
 
-# Wait for Openvidu Media Nodes
-if [ ! -z "${OPENVIDU_PRO_CLUSTER_MEDIA_NODES_IPS}" ]; then 
-  printf "\n"
-  printf "\n  ======================================="
-  printf "\n  =          WAIT MEDIA NODES           ="
-  printf "\n  ======================================="
-  printf "\n"
-  
-  IFS=','
-  for IP_MEDIANODE in $(echo "${OPENVIDU_PRO_CLUSTER_MEDIA_NODES_IPS}" | sed -e 's/\[//g' -e 's/\]//g' -e 's/"//g' | tr -d '[:space:]')
-  do
-    while true
-    do
-      HTTP_STATUS="$(curl \
-                        --silent \
-                        --no-buffer \
-                        --connect-timeout 2 \
-                        --write-out '%{http_code}' \
-                        --header "Connection: Upgrade" \
-                        --header "Upgrade: websocket" \
-                        --header "Host: 127.0.0.1:8888" \
-                        --header "Origin: 127.0.0.1" \
-                        http://${IP_MEDIANODE}:8888/kurento)"
-
-      printf "\n  Waiting for Media Node with IP: '%s'..." "${IP_MEDIANODE}"
-
-      if [ "$HTTP_STATUS" == "500" ]; then
-        printf "\n  ==== Media Node '%s' is ready ====" "${IP_MEDIANODE}"
-        break
-      fi
-
-      sleep 1
-    done
-  done
-fi
-
 # Launch Openvidu Pro
 printf "\n"
 printf "\n  ======================================="