From ceb58d28bea3069f627d211d9eb3c08380e512cd Mon Sep 17 00:00:00 2001
From: cruizba <carlos.ruizbal@gmail.com>
Date: Fri, 15 Oct 2021 00:47:13 +0200
Subject: [PATCH] Fix OPENVIDU_URL in insecure docker tutorials OPENVIDU_URL is
 used properly in docker images serving nginx static insecure tutorials.
 Before, location.hostname was always used

---
 openvidu-getaroom/docker/docker-compose.override.yml    | 4 ++--
 openvidu-getaroom/docker/entrypoint.sh                  | 2 +-
 openvidu-insecure-js/docker/docker-compose.override.yml | 4 ++--
 openvidu-insecure-js/docker/entrypoint.sh               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openvidu-getaroom/docker/docker-compose.override.yml b/openvidu-getaroom/docker/docker-compose.override.yml
index d49d59f4..ec41678c 100644
--- a/openvidu-getaroom/docker/docker-compose.override.yml
+++ b/openvidu-getaroom/docker/docker-compose.override.yml
@@ -6,5 +6,5 @@ services:
         restart: on-failure
         network_mode: host
         environment:
-            - OPENVIDU_URL=http://localhost:5443
-            - OPENVIDU_SECRET=${OPENVIDU_SECRET}
\ No newline at end of file
+            - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443}
+            - OPENVIDU_SECRET=${OPENVIDU_SECRET}
diff --git a/openvidu-getaroom/docker/entrypoint.sh b/openvidu-getaroom/docker/entrypoint.sh
index 31215834..313401c9 100644
--- a/openvidu-getaroom/docker/entrypoint.sh
+++ b/openvidu-getaroom/docker/entrypoint.sh
@@ -3,7 +3,7 @@
 [ ! -z "${OPENVIDU_URL}" ] && echo "OPENVIDU_URL: ${OPENVIDU_URL}" || echo "OPENVIDU_URL: default"
 [ ! -z "${OPENVIDU_SECRET}" ] && echo "OPENVIDU_SECRET: ${OPENVIDU_SECRET}" || echo "OPENVIDU_SECRET: default"
 
-sed -i "s/^var OPENVIDU_SERVER_URL =.*$/var OPENVIDU_SERVER_URL = \"$(echo https://\" + location.hostname | sed 's#/#\\/#g');/" /var/www/openvidu-getaroom/app.js
+sed -i "s|^var OPENVIDU_SERVER_URL =.*$|var OPENVIDU_SERVER_URL = \"${OPENVIDU_URL}\";|" /var/www/openvidu-getaroom/app.js
 
 if [ ! -z "${OPENVIDU_SECRET}" ]; then
     sed -i "s/^var OPENVIDU_SERVER_SECRET =.*$/var OPENVIDU_SERVER_SECRET = \"${OPENVIDU_SECRET}\";/" /var/www/openvidu-getaroom/app.js
diff --git a/openvidu-insecure-js/docker/docker-compose.override.yml b/openvidu-insecure-js/docker/docker-compose.override.yml
index 54e7974c..597818d0 100644
--- a/openvidu-insecure-js/docker/docker-compose.override.yml
+++ b/openvidu-insecure-js/docker/docker-compose.override.yml
@@ -6,5 +6,5 @@ services:
         restart: on-failure
         network_mode: host
         environment:
-            - OPENVIDU_URL=http://localhost:5443
-            - OPENVIDU_SECRET=${OPENVIDU_SECRET}
\ No newline at end of file
+            - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443}
+            - OPENVIDU_SECRET=${OPENVIDU_SECRET}
diff --git a/openvidu-insecure-js/docker/entrypoint.sh b/openvidu-insecure-js/docker/entrypoint.sh
index 57da86e4..3349ec66 100644
--- a/openvidu-insecure-js/docker/entrypoint.sh
+++ b/openvidu-insecure-js/docker/entrypoint.sh
@@ -3,7 +3,7 @@
 [ ! -z "${OPENVIDU_URL}" ] && echo "OPENVIDU_URL: ${OPENVIDU_URL}" || echo "OPENVIDU_URL: default"
 [ ! -z "${OPENVIDU_SECRET}" ] && echo "OPENVIDU_SECRET: ${OPENVIDU_SECRET}" || echo "OPENVIDU_SECRET: default"
 
-sed -i "s/^var OPENVIDU_SERVER_URL =.*$/var OPENVIDU_SERVER_URL = \"$(echo https://\" + location.hostname | sed 's#/#\\/#g');/" /var/www/openvidu-insecure-js/app.js
+sed -i "s|^var OPENVIDU_SERVER_URL =.*$|var OPENVIDU_SERVER_URL = \"${OPENVIDU_URL}\";|" /var/www/openvidu-insecure-js/app.js
 
 if [ ! -z "${OPENVIDU_SECRET}" ]; then
     sed -i "s/^var OPENVIDU_SERVER_SECRET =.*$/var OPENVIDU_SERVER_SECRET = \"${OPENVIDU_SECRET}\";/" /var/www/openvidu-insecure-js/app.js