From dcdb9f06fdcc3bec01fbf02868446edaa6bd3a77 Mon Sep 17 00:00:00 2001
From: csantosm <4a.santos@gmail.com>
Date: Wed, 30 Sep 2020 15:52:33 +0200
Subject: [PATCH] Updated insecure-js tutorial to fit with docker deployment

---
 openvidu-insecure-js/docker/Dockerfile                 |  2 --
 .../docker/docker-compose.override.yml                 | 10 ++++++++++
 openvidu-insecure-js/docker/entrypoint.sh              |  4 +---
 openvidu-insecure-js/docker/openvidu-insecure-js.conf  |  3 +--
 openvidu-insecure-js/web/app.js                        |  4 ++--
 5 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 openvidu-insecure-js/docker/docker-compose.override.yml

diff --git a/openvidu-insecure-js/docker/Dockerfile b/openvidu-insecure-js/docker/Dockerfile
index 3f7c31b3..53f957fd 100644
--- a/openvidu-insecure-js/docker/Dockerfile
+++ b/openvidu-insecure-js/docker/Dockerfile
@@ -1,7 +1,5 @@
 FROM nginx:1.19.2-alpine
 
-ARG OPENVIDU_TUTORIALS_VERSION
-
 RUN apk update && \
     # apk add wget && \
     rm -rf /var/cache/apk/*
diff --git a/openvidu-insecure-js/docker/docker-compose.override.yml b/openvidu-insecure-js/docker/docker-compose.override.yml
new file mode 100644
index 00000000..51f2b117
--- /dev/null
+++ b/openvidu-insecure-js/docker/docker-compose.override.yml
@@ -0,0 +1,10 @@
+version: '3.1'
+
+services:
+    app:
+        image: openvidu/openvidu-insecure-js-demo:2.15.0
+        restart: on-failure
+        network_mode: host
+        environment:
+            - OPENVIDU_URL=http://localhost:5443
+            - OPENVIDU_SECRET=${OPENVIDU_SECRET}
\ No newline at end of file
diff --git a/openvidu-insecure-js/docker/entrypoint.sh b/openvidu-insecure-js/docker/entrypoint.sh
index 03e41bea..57da86e4 100644
--- a/openvidu-insecure-js/docker/entrypoint.sh
+++ b/openvidu-insecure-js/docker/entrypoint.sh
@@ -3,9 +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"
 
-if [ ! -z "${OPENVIDU_URL}" ]; then
-    sed -i "s/^var OPENVIDU_SERVER_URL =.*$/var OPENVIDU_SERVER_URL = \"$(echo "${OPENVIDU_URL}" | sed 's#/#\\/#g')\";/" /var/www/openvidu-insecure-js/app.js
-fi
+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
 
 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
diff --git a/openvidu-insecure-js/docker/openvidu-insecure-js.conf b/openvidu-insecure-js/docker/openvidu-insecure-js.conf
index f8c05cf7..d9e1beb1 100644
--- a/openvidu-insecure-js/docker/openvidu-insecure-js.conf
+++ b/openvidu-insecure-js/docker/openvidu-insecure-js.conf
@@ -1,6 +1,5 @@
 server {
-    listen       80;
-    server_name  localhost;
+    listen       5442;
 
     root /var/www/openvidu-insecure-js;
 }
\ No newline at end of file
diff --git a/openvidu-insecure-js/web/app.js b/openvidu-insecure-js/web/app.js
index 256db584..d7aa77b2 100644
--- a/openvidu-insecure-js/web/app.js
+++ b/openvidu-insecure-js/web/app.js
@@ -67,7 +67,7 @@ function joinSession() {
 					publishVideo: true,  	// Whether you want to start publishing with your video enabled or not
 					resolution: '640x480',  // The resolution of your video
 					frameRate: 30,			// The frame rate of your video
-					insertMode: 'APPEND',	// How the video is inserted in the target element 'video-container'	
+					insertMode: 'APPEND',	// How the video is inserted in the target element 'video-container'
 					mirror: false       	// Whether to mirror your local video or not
 				});
 
@@ -97,7 +97,7 @@ function leaveSession() {
 
 	session.disconnect();
 
-	// Removing all HTML elements with user's nicknames. 
+	// Removing all HTML elements with user's nicknames.
 	// HTML videos are automatically removed when leaving a Session
 	removeAllUserData();