From cb478a7404c647f34d3b808ebca7633d1bd430d7 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Fri, 16 Sep 2022 13:12:08 +0200
Subject: [PATCH] openvidu-js: use openvidu-basic-node as application server in
 Docker deployment

---
 openvidu-basic-node/index.js       | 4 +++-
 openvidu-js/docker/Dockerfile      | 8 ++++++--
 openvidu-js/docker/create_image.sh | 8 +++++++-
 openvidu-js/docker/entrypoint.sh   | 9 +++++++--
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/openvidu-basic-node/index.js b/openvidu-basic-node/index.js
index c70888cd..4e2d96c7 100644
--- a/openvidu-basic-node/index.js
+++ b/openvidu-basic-node/index.js
@@ -1,4 +1,4 @@
-require("dotenv").config();
+require("dotenv").config(!!process.env.CONFIG ? {path: process.env.CONFIG} : {});
 var express = require("express");
 var bodyParser = require("body-parser");
 var http = require("http");
@@ -25,6 +25,8 @@ server.listen(5000, () => {
   console.log("Application started");
 });
 
+console.warn('Application server connecting to OpenVidu at ' + process.env.OPENVIDU_URL);
+
 var openvidu = new OpenVidu(
   process.env.OPENVIDU_URL,
   process.env.OPENVIDU_SECRET
diff --git a/openvidu-js/docker/Dockerfile b/openvidu-js/docker/Dockerfile
index 9f497707..dbbb9b4a 100644
--- a/openvidu-js/docker/Dockerfile
+++ b/openvidu-js/docker/Dockerfile
@@ -1,13 +1,17 @@
-FROM nginx:1.19.2-alpine
+FROM nginx:1.23.1-alpine
 
 RUN apk update && \
-    # apk add wget && \
+    apk add --update npm && \
     rm -rf /var/cache/apk/*
 
 # Install openvidu-js
 COPY ./web /var/www/openvidu-js
 RUN chown -R nginx:nginx /var/www/openvidu-js
 
+# Copy openvidu-basic-node
+COPY ./openvidu-basic-node /var/www/openvidu-basic-node
+RUN npm --prefix /var/www/openvidu-basic-node install
+
 # Nginx conf
 COPY ./docker/openvidu-js.conf /etc/nginx/conf.d/default.conf
 
diff --git a/openvidu-js/docker/create_image.sh b/openvidu-js/docker/create_image.sh
index 635fed01..d95f68ff 100755
--- a/openvidu-js/docker/create_image.sh
+++ b/openvidu-js/docker/create_image.sh
@@ -2,5 +2,11 @@
 
 pushd ../
 
+cp -r ../openvidu-basic-node .
+
+trap 'rm -rf ./openvidu-basic-node' ERR
+
 docker build -f docker/Dockerfile -t openvidu/openvidu-js-demo .
-docker tag openvidu/openvidu-js-demo:latest openvidu/openvidu-js-demo:2.18.0
\ No newline at end of file
+docker tag openvidu/openvidu-js-demo:latest openvidu/openvidu-js-demo:2.22.0
+
+rm -rf ./openvidu-basic-node
\ No newline at end of file
diff --git a/openvidu-js/docker/entrypoint.sh b/openvidu-js/docker/entrypoint.sh
index 14852a3d..80b325ef 100644
--- a/openvidu-js/docker/entrypoint.sh
+++ b/openvidu-js/docker/entrypoint.sh
@@ -3,12 +3,17 @@
 [ ! -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 = \"${OPENVIDU_URL}\";|" /var/www/openvidu-js/app.js
+if [ ! -z "${OPENVIDU_SECRET}" ]; then
+    sed -i "s|^OPENVIDU_URL=.*$|OPENVIDU_URL=${OPENVIDU_URL}|" /var/www/openvidu-basic-node/.env
+fi
 
 if [ ! -z "${OPENVIDU_SECRET}" ]; then
-    sed -i "s/^var OPENVIDU_SERVER_SECRET =.*$/var OPENVIDU_SERVER_SECRET = \"${OPENVIDU_SECRET}\";/" /var/www/openvidu-js/app.js
+    sed -i "s/^OPENVIDU_SECRET=.*$/OPENVIDU_SECRET=${OPENVIDU_SECRET}/" /var/www/openvidu-basic-node/.env
 fi
 
+# Run openvidu-basic-node
+CONFIG=/var/www/openvidu-basic-node/.env node /var/www/openvidu-basic-node/index.js > /var/log/nginx/openvidu-basic-node.log &
+
 # Run nginx
 nginx -g "daemon on;"