From 1ddfa8e4b967e297acf4827c81010a209ba9a549 Mon Sep 17 00:00:00 2001 From: cruizba Date: Fri, 15 Oct 2021 16:51:55 +0200 Subject: [PATCH] Add screenshare tutorial, update and fixes demos infrastructure - Added new tutorial for screenshare - Update FROM of all demos docker images - Don't use upstream in nginx. This will make nginx stop when a domain is not reachable on startup. --- docker/openvidu-basic-screenshare/Dockerfile | 26 ++++++++++++ .../create_image.sh | 4 ++ .../openvidu-basic-screenshare/entrypoint.sh | 18 +++++++++ .../openvidu-basic-screenshare.conf | 6 +++ .../openvidu-basic-videoconference/Dockerfile | 2 +- .../openvidu-basic-videoconference.conf | 2 +- docker/openvidu-basic-webinar/Dockerfile | 2 +- docker/openvidu-classroom/Dockerfile | 2 +- docker/openvidu-demo-proxy/Dockerfile | 2 +- docker/openvidu-demo-proxy/conf/default.conf | 37 ++++++------------ .../openvidu-demo-proxy/conf/html/index.html | 28 ++++++++----- .../resources/images/basic_screenshare.png | Bin 0 -> 7013 bytes docker/openvidu-demo-proxy/entrypoint.sh | 12 +++--- .../docker-compose.yml | 34 ++++++++++------ docker/openvidu-getaroom/Dockerfile | 2 +- openvidu-insecure-js-screen-share/web/app.js | 2 +- 16 files changed, 118 insertions(+), 61 deletions(-) create mode 100644 docker/openvidu-basic-screenshare/Dockerfile create mode 100755 docker/openvidu-basic-screenshare/create_image.sh create mode 100644 docker/openvidu-basic-screenshare/entrypoint.sh create mode 100644 docker/openvidu-basic-screenshare/openvidu-basic-screenshare.conf create mode 100644 docker/openvidu-demo-proxy/conf/html/resources/images/basic_screenshare.png diff --git a/docker/openvidu-basic-screenshare/Dockerfile b/docker/openvidu-basic-screenshare/Dockerfile new file mode 100644 index 00000000..4a802a9d --- /dev/null +++ b/docker/openvidu-basic-screenshare/Dockerfile @@ -0,0 +1,26 @@ +FROM nginx:1.21.3-alpine + +ARG OPENVIDU_TUTORIALS_VERSION + +RUN apk update && \ + apk add wget && \ + rm -rf /var/cache/apk/* + +# Install basic-videoconference +RUN mkdir -p /var/www/openvidu-basic-screenshare && \ + wget -L -O /tmp/openvidu-tutorials.tar.gz \ + "https://github.com/OpenVidu/openvidu-tutorials/archive/v${OPENVIDU_TUTORIALS_VERSION}.tar.gz" && \ + tar zxf /tmp/openvidu-tutorials.tar.gz -C /tmp && \ + rm /tmp/openvidu-tutorials.tar.gz && \ + cp -r /tmp/openvidu-tutorials*/openvidu-insecure-js-screen-share/web/* /var/www/openvidu-basic-screenshare && \ + rm -r /tmp/openvidu-tutorials* && \ + chown -R nginx:nginx /var/www/openvidu-basic-screenshare + +# Nginx conf +COPY ./openvidu-basic-screenshare.conf /etc/nginx/conf.d/default.conf + +# Entrypoint +COPY ./entrypoint.sh /usr/local/bin +RUN chmod +x /usr/local/bin/entrypoint.sh + +CMD /usr/local/bin/entrypoint.sh diff --git a/docker/openvidu-basic-screenshare/create_image.sh b/docker/openvidu-basic-screenshare/create_image.sh new file mode 100755 index 00000000..c4d6c224 --- /dev/null +++ b/docker/openvidu-basic-screenshare/create_image.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +docker build --pull --no-cache --rm=true --build-arg OPENVIDU_TUTORIALS_VERSION="$1" -t openvidu/openvidu-basic-screenshare . +docker tag openvidu/openvidu-basic-screenshare:latest openvidu/openvidu-basic-screenshare:$1 diff --git a/docker/openvidu-basic-screenshare/entrypoint.sh b/docker/openvidu-basic-screenshare/entrypoint.sh new file mode 100644 index 00000000..cfc2debd --- /dev/null +++ b/docker/openvidu-basic-screenshare/entrypoint.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +[ ! -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-basic-screenshare/app.js +fi + +if [ ! -z "${OPENVIDU_SECRET}" ]; then + sed -i "s/^var OPENVIDU_SERVER_SECRET =.*$/var OPENVIDU_SERVER_SECRET = \"${OPENVIDU_SECRET}\";/" /var/www/openvidu-basic-screenshare/app.js +fi + +# Run nginx +nginx -g "daemon on;" + +# Show logs +tail -f /var/log/nginx/*.log diff --git a/docker/openvidu-basic-screenshare/openvidu-basic-screenshare.conf b/docker/openvidu-basic-screenshare/openvidu-basic-screenshare.conf new file mode 100644 index 00000000..23f3bffb --- /dev/null +++ b/docker/openvidu-basic-screenshare/openvidu-basic-screenshare.conf @@ -0,0 +1,6 @@ +server { + listen 80; + server_name localhost; + + root /var/www/openvidu-basic-screenshare; +} diff --git a/docker/openvidu-basic-videoconference/Dockerfile b/docker/openvidu-basic-videoconference/Dockerfile index c7b11196..ccc31b9a 100644 --- a/docker/openvidu-basic-videoconference/Dockerfile +++ b/docker/openvidu-basic-videoconference/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.18.0-alpine +FROM nginx:1.21.3-alpine ARG OPENVIDU_TUTORIALS_VERSION diff --git a/docker/openvidu-basic-videoconference/openvidu-basic-videoconference.conf b/docker/openvidu-basic-videoconference/openvidu-basic-videoconference.conf index af118cee..0a0c9b3d 100644 --- a/docker/openvidu-basic-videoconference/openvidu-basic-videoconference.conf +++ b/docker/openvidu-basic-videoconference/openvidu-basic-videoconference.conf @@ -3,4 +3,4 @@ server { server_name localhost; root /var/www/openvidu-basic-videoconference; -} \ No newline at end of file +} diff --git a/docker/openvidu-basic-webinar/Dockerfile b/docker/openvidu-basic-webinar/Dockerfile index de3b2a9d..4b783452 100644 --- a/docker/openvidu-basic-webinar/Dockerfile +++ b/docker/openvidu-basic-webinar/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.13 ARG OPENVIDU_TUTORIALS_VERSION diff --git a/docker/openvidu-classroom/Dockerfile b/docker/openvidu-classroom/Dockerfile index e305b844..b66c9525 100644 --- a/docker/openvidu-classroom/Dockerfile +++ b/docker/openvidu-classroom/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.13 ARG OPENVIDU_TUTORIALS_VERSION diff --git a/docker/openvidu-demo-proxy/Dockerfile b/docker/openvidu-demo-proxy/Dockerfile index b2dce527..e3cd3c35 100644 --- a/docker/openvidu-demo-proxy/Dockerfile +++ b/docker/openvidu-demo-proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.18.0-alpine +FROM nginx:1.21.3-alpine # Nginx conf COPY ./conf/html /var/www/html diff --git a/docker/openvidu-demo-proxy/conf/default.conf b/docker/openvidu-demo-proxy/conf/default.conf index 1522062f..76468ea0 100644 --- a/docker/openvidu-demo-proxy/conf/default.conf +++ b/docker/openvidu-demo-proxy/conf/default.conf @@ -2,26 +2,6 @@ add_header X-Frame-Options SAMEORIGIN; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; -upstream openvidu-basic-videoconference { - server url_ov_basic_videoconference; -} - -upstream openvidu-basic-webinar { - server url_ov_basic_webinar; -} - -upstream openvidu-classroom { - server url_ov_classroom; -} - -upstream openvidu-getaroom { - server url_ov_getaroom; -} - -upstream openvidu-call { - server url_ov_call; -} - server { listen 80; server_name _; @@ -40,29 +20,34 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - + location /basic-videoconference { rewrite /basic-videoconference(.*) /$1 break; - proxy_pass http://openvidu-basic-videoconference; + proxy_pass url_ov_basic_videoconference; + } + + location /basic-screenshare { + rewrite /basic-screenshare(.*) /$1 break; + proxy_pass url_ov_basic_screenshare; } location /basic-webinar { rewrite /basic-webinar(.*) /$1 break; - proxy_pass https://openvidu-basic-webinar; + proxy_pass url_ov_basic_webinar; } location /getaroom { rewrite /getaroom(.*) /$1 break; - proxy_pass http://openvidu-getaroom; + proxy_pass url_ov_getaroom; } location /classroom { rewrite /classroom(.*) $1 break; - proxy_pass https://openvidu-classroom; + proxy_pass url_ov_classroom; } location /openvidu-call { rewrite /openvidu-call(.*) $1 break; - proxy_pass http://openvidu-call; + proxy_pass url_ov_call; } } diff --git a/docker/openvidu-demo-proxy/conf/html/index.html b/docker/openvidu-demo-proxy/conf/html/index.html index 13f36683..56cfb762 100644 --- a/docker/openvidu-demo-proxy/conf/html/index.html +++ b/docker/openvidu-demo-proxy/conf/html/index.html @@ -44,7 +44,15 @@
-

Basic Videoconference

+

Basic
Videoconference

+
+ + +
+ + +
+

Basic Videoconference with Screen Share
@@ -52,7 +60,15 @@
-

Basic Webinar

+

Basic
Webinar

+
+ + +
+ + +
+

OpenVidu Call
@@ -72,14 +88,6 @@ -
- - -
-

OpenVidu Call

-
- -
diff --git a/docker/openvidu-demo-proxy/conf/html/resources/images/basic_screenshare.png b/docker/openvidu-demo-proxy/conf/html/resources/images/basic_screenshare.png new file mode 100644 index 0000000000000000000000000000000000000000..97d14d6f46d421cb63c5c2df0772ec6bb3901cff GIT binary patch literal 7013 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 literal 0 HcmV?d00001 diff --git a/docker/openvidu-demo-proxy/entrypoint.sh b/docker/openvidu-demo-proxy/entrypoint.sh index 4b6a9e9f..c5e9ba6e 100644 --- a/docker/openvidu-demo-proxy/entrypoint.sh +++ b/docker/openvidu-demo-proxy/entrypoint.sh @@ -2,17 +2,19 @@ # Show input enviroment variables echo "openvidu-basic-videoconference: ${URL_OV_BASIC_VIDEOCONFERENCE}" +echo "openvidu-basic-screenshare: ${URL_OV_BASIC_SCREENSHARE}" echo "openvidu-basic-webinar: ${URL_OV_BASIC_WEBINAR}" echo "openvidu-classroom: ${URL_OV_CLASSROOM}" echo "openvidu-getaroom: ${URL_OV_GETAROOM}" echo "openvidu-call: ${URL_OV_CALL}" # Load nginx conf files -sed -i "s/url_ov_basic_videoconference/${URL_OV_BASIC_VIDEOCONFERENCE}/" /etc/nginx/conf.d/default.conf -sed -i "s/url_ov_basic_webinar/${URL_OV_BASIC_WEBINAR}/" /etc/nginx/conf.d/default.conf -sed -i "s/url_ov_classroom/${URL_OV_CLASSROOM}/" /etc/nginx/conf.d/default.conf -sed -i "s/url_ov_getaroom/${URL_OV_GETAROOM}/" /etc/nginx/conf.d/default.conf -sed -i "s/url_ov_call/${URL_OV_CALL}/" /etc/nginx/conf.d/default.conf +sed -i "s|url_ov_basic_videoconference|${URL_OV_BASIC_VIDEOCONFERENCE}|" /etc/nginx/conf.d/default.conf +sed -i "s|url_ov_basic_screenshare|${URL_OV_BASIC_SCREENSHARE}|" /etc/nginx/conf.d/default.conf +sed -i "s|url_ov_basic_webinar|${URL_OV_BASIC_WEBINAR}|" /etc/nginx/conf.d/default.conf +sed -i "s|url_ov_classroom|${URL_OV_CLASSROOM}|" /etc/nginx/conf.d/default.conf +sed -i "s|url_ov_getaroom|${URL_OV_GETAROOM}|" /etc/nginx/conf.d/default.conf +sed -i "s|url_ov_call|${URL_OV_CALL}|" /etc/nginx/conf.d/default.conf # Run nginx nginx -g "daemon off;" diff --git a/docker/openvidu-demos-docker-compose/docker-compose.yml b/docker/openvidu-demos-docker-compose/docker-compose.yml index 29bf0104..07121182 100644 --- a/docker/openvidu-demos-docker-compose/docker-compose.yml +++ b/docker/openvidu-demos-docker-compose/docker-compose.yml @@ -5,47 +5,55 @@ services: openvidu-basic-videoconference: image: openvidu/openvidu-basic-videoconference:2.20.0 restart: on-failure - environment: + environment: - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} - OPENVIDU_SECRET=${OPENVIDU_SECRET:-} - + + openvidu-basic-screenshare: + image: openvidu/openvidu-basic-screenshare:2.20.0 + restart: on-failure + environment: + - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} + - OPENVIDU_SECRET=${OPENVIDU_SECRET:-} + openvidu-basic-webinar: image: openvidu/openvidu-basic-webinar:2.20.0 restart: on-failure - environment: + environment: - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} - OPENVIDU_SECRET=${OPENVIDU_SECRET:-} openvidu-classroom: image: openvidu/openvidu-classroom:2.20.0 restart: on-failure - environment: + environment: - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} - OPENVIDU_SECRET=${OPENVIDU_SECRET:-} - + openvidu-getaroom: image: openvidu/openvidu-getaroom:2.20.0 restart: on-failure - environment: + environment: - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} - OPENVIDU_SECRET=${OPENVIDU_SECRET:-} openvidu-call: image: openvidu/openvidu-call:2.20.0-demos restart: on-failure - environment: + environment: - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} - OPENVIDU_SECRET=${OPENVIDU_SECRET:-} - CALL_OPENVIDU_CERTTYPE=${CERTIFICATE_TYPE} demos-page: - image: openvidu/openvidu-demo-proxy:1.0.0 + image: openvidu/openvidu-demo-proxy:1.1.0 restart: on-failure ports: - "5442:80" environment: - - URL_OV_BASIC_VIDEOCONFERENCE=openvidu-basic-videoconference:80 - - URL_OV_BASIC_WEBINAR=openvidu-basic-webinar:5000 - - URL_OV_CLASSROOM=openvidu-classroom:5000 - - URL_OV_GETAROOM=openvidu-getaroom:80 - - URL_OV_CALL=openvidu-call:5000 + - URL_OV_BASIC_VIDEOCONFERENCE=http://openvidu-basic-videoconference:80 + - URL_OV_BASIC_SCREENSHARE=http://openvidu-basic-screenshare:80 + - URL_OV_BASIC_WEBINAR=http://openvidu-basic-webinar:5000 + - URL_OV_CLASSROOM=https://openvidu-classroom:5000 + - URL_OV_GETAROOM=http://openvidu-getaroom:80 + - URL_OV_CALL=http://openvidu-call:5000 diff --git a/docker/openvidu-getaroom/Dockerfile b/docker/openvidu-getaroom/Dockerfile index 1ff93538..b282ef11 100644 --- a/docker/openvidu-getaroom/Dockerfile +++ b/docker/openvidu-getaroom/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.18.0-alpine +FROM nginx:1.21.3-alpine ARG OPENVIDU_TUTORIALS_VERSION diff --git a/openvidu-insecure-js-screen-share/web/app.js b/openvidu-insecure-js-screen-share/web/app.js index 2671eeb0..be8c0b89 100644 --- a/openvidu-insecure-js-screen-share/web/app.js +++ b/openvidu-insecure-js-screen-share/web/app.js @@ -190,7 +190,7 @@ window.onbeforeunload = function () { }; function generateParticipantInfo() { - document.getElementById("sessionId").value = "SessionA"; + document.getElementById("sessionId").value = "SessionScreenA"; document.getElementById("userName").value = "Participant" + Math.floor(Math.random() * 100); }