From 98b3eb8728cb3cf295490cb42104fb5fde26c640 Mon Sep 17 00:00:00 2001 From: cruizba Date: Wed, 21 Sep 2022 15:02:48 +0200 Subject: [PATCH] Update new docker build of demos structure --- docker/create_images.sh | 74 ++++++++++++++++--- 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 | 26 ------- .../create_image.sh | 4 - .../entrypoint.sh | 18 ----- .../openvidu-basic-videoconference.conf | 6 -- docker/openvidu-basic-webinar/Dockerfile | 19 ----- docker/openvidu-basic-webinar/create_image.sh | 4 - docker/openvidu-basic-webinar/entrypoint.sh | 13 ---- docker/openvidu-classroom/Dockerfile | 20 ----- docker/openvidu-classroom/create_image.sh | 4 - docker/openvidu-classroom/entrypoint.sh | 63 ---------------- docker/openvidu-demo-proxy/conf/default.conf | 10 +-- docker/openvidu-demo-proxy/create_image.sh | 6 +- docker/openvidu-demo-proxy/entrypoint.sh | 20 ++--- .../docker-compose.yml | 38 ++++++---- docker/openvidu-getaroom/Dockerfile | 26 ------- docker/openvidu-getaroom/create_image.sh | 4 - docker/openvidu-getaroom/entrypoint.sh | 18 ----- .../openvidu-getaroom/openvidu-getaroom.conf | 6 -- docker/push_images.sh | 18 ++--- openvidu-basic-node/.dockerignore | 1 + openvidu-basic-node/docker/Dockerfile | 11 +++ openvidu-basic-node/docker/create_image.sh | 9 +++ openvidu-getaroom/docker/Dockerfile | 10 +-- openvidu-getaroom/docker/create_image.sh | 7 +- openvidu-js-screen-share/docker/Dockerfile | 10 +-- .../docker/create_image.sh | 7 +- openvidu-js/docker/Dockerfile | 10 +-- openvidu-js/docker/create_image.sh | 7 +- openvidu-roles-java/docker/create_image.sh | 8 +- 34 files changed, 172 insertions(+), 359 deletions(-) delete mode 100644 docker/openvidu-basic-screenshare/Dockerfile delete mode 100755 docker/openvidu-basic-screenshare/create_image.sh delete mode 100644 docker/openvidu-basic-screenshare/entrypoint.sh delete mode 100644 docker/openvidu-basic-screenshare/openvidu-basic-screenshare.conf delete mode 100644 docker/openvidu-basic-videoconference/Dockerfile delete mode 100755 docker/openvidu-basic-videoconference/create_image.sh delete mode 100644 docker/openvidu-basic-videoconference/entrypoint.sh delete mode 100644 docker/openvidu-basic-videoconference/openvidu-basic-videoconference.conf delete mode 100644 docker/openvidu-basic-webinar/Dockerfile delete mode 100755 docker/openvidu-basic-webinar/create_image.sh delete mode 100644 docker/openvidu-basic-webinar/entrypoint.sh delete mode 100644 docker/openvidu-classroom/Dockerfile delete mode 100755 docker/openvidu-classroom/create_image.sh delete mode 100644 docker/openvidu-classroom/entrypoint.sh delete mode 100644 docker/openvidu-getaroom/Dockerfile delete mode 100755 docker/openvidu-getaroom/create_image.sh delete mode 100644 docker/openvidu-getaroom/entrypoint.sh delete mode 100644 docker/openvidu-getaroom/openvidu-getaroom.conf create mode 100644 openvidu-basic-node/.dockerignore create mode 100644 openvidu-basic-node/docker/Dockerfile create mode 100755 openvidu-basic-node/docker/create_image.sh diff --git a/docker/create_images.sh b/docker/create_images.sh index 0cf674e1..c6a65e91 100755 --- a/docker/create_images.sh +++ b/docker/create_images.sh @@ -1,15 +1,71 @@ #!/bin/bash +set -eu -o pipefail if [ $# -eq 0 ]; then - echo "No version argument provided. Usage: \"./create_images.sh 2.17.0\"" + echo "No version argument provided. Usage: \"./create_images.sh X.Y.Z\"" exit 1 fi -for folder in */ ; do - echo - echo "Building image of $folder" - echo - cd "$folder" || exit - ./create_image.sh $1 - cd .. -done \ No newline at end of file +pushd .. + +# ======================= +# Building tutorials +# ======================= + +# Build openvidu-js-screenshare +pushd openvidu-js-screen-share/docker || exit 1 +./create_image.sh "$1" +popd || exit 1 + +# Build openvidu-js-screenshare +pushd openvidu-js/docker || exit 1 +./create_image.sh "$1" +popd || exit 1 + +# Build openvidu-js-screenshare +pushd openvidu-roles-java/docker || exit 1 +./create_image.sh "$1" +popd || exit 1 + +# Build openvidu-js-screenshare +pushd openvidu-getaroom/docker || exit 1 +./create_image.sh "$1" +popd || exit 1 + +# Build openvidu-js-screenshare +pushd ../classroom-demo/docker || exit 1 +./create_image.sh "$1" +popd || exit 1 + +# ======================= +# Building Basic application servers +# ======================= +pushd openvidu-basic-node/docker || exit 1 +./create_image.sh "$1" +popd || exit 1 + +popd || exit 1 + +# ======================= +# Building Demos Proxy +# ======================= +pushd openvidu-demo-proxy || exit 1 +./create_image.sh "$1" +popd || exit 1 + +# Retag images for demos +docker tag openvidu/openvidu-js:"$1" openvidu/openvidu-js-demo:"$1" +docker rmi openvidu/openvidu-js:"$1" + +docker tag openvidu/openvidu-js-screen-share:"$1" openvidu/openvidu-js-screen-share-demo:"$1" +docker rmi openvidu/openvidu-js-screen-share:"$1" + +docker tag openvidu/openvidu-roles-java:"$1" openvidu/openvidu-roles-java-demo:"$1" +docker rmi openvidu/openvidu-roles-java:"$1" + +docker tag openvidu/openvidu-getaroom:"$1" openvidu/openvidu-getaroom-demo:"$1" +docker rmi openvidu/openvidu-getaroom:"$1" + +docker tag openvidu/openvidu-basic-node:"$1" openvidu/openvidu-basic-node-demo:"$1" +docker rmi openvidu/openvidu-basic-node:"$1" + diff --git a/docker/openvidu-basic-screenshare/Dockerfile b/docker/openvidu-basic-screenshare/Dockerfile deleted file mode 100644 index cf3f39f9..00000000 --- a/docker/openvidu-basic-screenshare/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -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-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 deleted file mode 100755 index c4d6c224..00000000 --- a/docker/openvidu-basic-screenshare/create_image.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/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 deleted file mode 100644 index cfc2debd..00000000 --- a/docker/openvidu-basic-screenshare/entrypoint.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/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 deleted file mode 100644 index 23f3bffb..00000000 --- a/docker/openvidu-basic-screenshare/openvidu-basic-screenshare.conf +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index c7a2cecf..00000000 --- a/docker/openvidu-basic-videoconference/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -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-videoconference && \ - 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-js/web/* /var/www/openvidu-basic-videoconference && \ - rm -r /tmp/openvidu-tutorials* && \ - chown -R nginx:nginx /var/www/openvidu-basic-videoconference - -# Nginx conf -COPY ./openvidu-basic-videoconference.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-videoconference/create_image.sh b/docker/openvidu-basic-videoconference/create_image.sh deleted file mode 100755 index 561086a6..00000000 --- a/docker/openvidu-basic-videoconference/create_image.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -docker build --pull --no-cache --rm=true --build-arg OPENVIDU_TUTORIALS_VERSION="$1" -t openvidu/openvidu-basic-videoconference . -docker tag openvidu/openvidu-basic-videoconference:latest openvidu/openvidu-basic-videoconference:$1 \ No newline at end of file diff --git a/docker/openvidu-basic-videoconference/entrypoint.sh b/docker/openvidu-basic-videoconference/entrypoint.sh deleted file mode 100644 index dcb4fc7f..00000000 --- a/docker/openvidu-basic-videoconference/entrypoint.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/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-videoconference/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-videoconference/app.js -fi - -# Run nginx -nginx -g "daemon on;" - -# Show logs -tail -f /var/log/nginx/*.log diff --git a/docker/openvidu-basic-videoconference/openvidu-basic-videoconference.conf b/docker/openvidu-basic-videoconference/openvidu-basic-videoconference.conf deleted file mode 100644 index 0a0c9b3d..00000000 --- a/docker/openvidu-basic-videoconference/openvidu-basic-videoconference.conf +++ /dev/null @@ -1,6 +0,0 @@ -server { - listen 80; - server_name localhost; - - root /var/www/openvidu-basic-videoconference; -} diff --git a/docker/openvidu-basic-webinar/Dockerfile b/docker/openvidu-basic-webinar/Dockerfile deleted file mode 100644 index 8cde564f..00000000 --- a/docker/openvidu-basic-webinar/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM alpine:3.13 - -ARG OPENVIDU_TUTORIALS_VERSION - -RUN apk update && \ - apk add wget && \ - apk add openjdk8-jre && \ - rm -rf /var/cache/apk/* - -# Install basic-videoconference -RUN mkdir -p /opt/openvidu-basic-webinar && \ - wget -L -O /opt/openvidu-roles-java.jar \ - "https://github.com/OpenVidu/openvidu-tutorials/releases/download/v${OPENVIDU_TUTORIALS_VERSION}/openvidu-roles-java-${OPENVIDU_TUTORIALS_VERSION}.jar" - -# 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-webinar/create_image.sh b/docker/openvidu-basic-webinar/create_image.sh deleted file mode 100755 index 4927026d..00000000 --- a/docker/openvidu-basic-webinar/create_image.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -docker build --pull --no-cache --rm=true --build-arg OPENVIDU_TUTORIALS_VERSION="$1" -t openvidu/openvidu-basic-webinar . -docker tag openvidu/openvidu-basic-webinar:latest openvidu/openvidu-basic-webinar:$1 \ No newline at end of file diff --git a/docker/openvidu-basic-webinar/entrypoint.sh b/docker/openvidu-basic-webinar/entrypoint.sh deleted file mode 100644 index 1a1f2489..00000000 --- a/docker/openvidu-basic-webinar/entrypoint.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/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" -[ ! -z "${APP_PORT}" ] && echo "APP_PORT: ${APP_PORT}" || echo "APP_PORT: default" - -# Run Application -JAVA_PROPERTIES="-Djava.security.egd=file:/dev/./urandom" -[ ! -z "${OPENVIDU_URL}" ] && JAVA_PROPERTIES=" ${JAVA_PROPERTIES} -Dopenvidu.url=${OPENVIDU_URL}" -[ ! -z "${OPENVIDU_SECRET}" ] && JAVA_PROPERTIES=" ${JAVA_PROPERTIES} -Dopenvidu.secret=${OPENVIDU_SECRET}" -[ ! -z "${APP_PORT}" ] && JAVA_PROPERTIES=" ${JAVA_PROPERTIES} -Dserver.port=${APP_PORT}" - -java ${JAVA_PROPERTIES} -jar /opt/openvidu-roles-java.jar diff --git a/docker/openvidu-classroom/Dockerfile b/docker/openvidu-classroom/Dockerfile deleted file mode 100644 index b66c9525..00000000 --- a/docker/openvidu-classroom/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM alpine:3.13 - -ARG OPENVIDU_TUTORIALS_VERSION - -RUN apk update && \ - apk add wget && \ - apk add openjdk8-jre && \ - apk add mysql mysql-client && \ - rm -rf /var/cache/apk/* - -# Install basic-videoconference -RUN mkdir -p /opt/openvidu-basic-webinar && \ - wget -L -O /opt/classroom-demo.jar \ - "https://github.com/OpenVidu/classroom-demo/releases/download/v${OPENVIDU_TUTORIALS_VERSION}/classroom-demo-${OPENVIDU_TUTORIALS_VERSION}.war" - -# 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-classroom/create_image.sh b/docker/openvidu-classroom/create_image.sh deleted file mode 100755 index 4553c200..00000000 --- a/docker/openvidu-classroom/create_image.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -docker build --pull --no-cache --rm=true --build-arg OPENVIDU_TUTORIALS_VERSION="$1" -t openvidu/openvidu-classroom . -docker tag openvidu/openvidu-classroom:latest openvidu/openvidu-classroom:$1 \ No newline at end of file diff --git a/docker/openvidu-classroom/entrypoint.sh b/docker/openvidu-classroom/entrypoint.sh deleted file mode 100644 index 664634e3..00000000 --- a/docker/openvidu-classroom/entrypoint.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then - MYSQL_ROOT_PASSWORD=$(cat < /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) - export MYSQL_ROOT_PASSWORD -fi - -if [ -z "${MYSQL_DATABASE}" ]; then - MYSQL_DATABASE=openvidu_sample_app - export MYSQL_DATABASE -fi - -echo "MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}" -echo "MYSQL_DATABASE: ${MYSQL_DATABASE}" -[ ! -z "${OPENVIDU_URL}" ] && echo "OPENVIDU_URL: ${OPENVIDU_URL}" || echo "OPENVIDU_URL: default" -[ ! -z "${OPENVIDU_SECRET}" ] && echo "OPENVIDU_SECRET: ${OPENVIDU_SECRET}" || echo "OPENVIDU_SECRET: default" -[ ! -z "${APP_PORT}" ] && echo "APP_PORT: ${APP_PORT}" || echo "APP_PORT: default" - -# Configure MySQL - -if [ -d "/run/mysqld" ]; then - echo "mysqld already present, skipping creation" - chown -R mysql:mysql /run/mysqld -else - echo "mysqld not found, creating...." - mkdir -p /run/mysqld - chown -R mysql:mysql /run/mysqld -fi - -if [ -d /var/lib/mysql/mysql ]; then - echo "MySQL directory already present, skipping creation" - chown -R mysql:mysql /var/lib/mysql -else - tfile=$(mktemp) - - mysql_install_db --user=mysql --ldata=/var/lib/mysql > /dev/null - - cat << EOF > "$tfile" -USE mysql; -FLUSH PRIVILEGES ; -GRANT ALL ON *.* TO 'root'@'%' identified by '$MYSQL_ROOT_PASSWORD' WITH GRANT OPTION ; -GRANT ALL ON *.* TO 'root'@'localhost' identified by '$MYSQL_ROOT_PASSWORD' WITH GRANT OPTION ; -SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${MYSQL_ROOT_PASSWORD}') ; -DROP DATABASE IF EXISTS test ; -FLUSH PRIVILEGES ; -CREATE DATABASE IF NOT EXISTS ${MYSQL_DATABASE} CHARACTER SET utf8 COLLATE utf8_general_ci; -EOF - - /usr/bin/mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$tfile" - rm -f "$tfile" -fi - -/usr/bin/mysqld --user=mysql --skip-name-resolve --skip-networking=0 & - -# Run Application -JAVA_PROPERTIES="-Djava.security.egd=file:/dev/./urandom" -JAVA_PROPERTIES=" ${JAVA_PROPERTIES} -Dspring.datasource.password=${MYSQL_ROOT_PASSWORD}" -JAVA_PROPERTIES=" ${JAVA_PROPERTIES} -Dspring.datasource.url=jdbc:mysql://127.0.0.1:3306/${MYSQL_DATABASE}" -[ ! -z "${OPENVIDU_URL}" ] && JAVA_PROPERTIES=" ${JAVA_PROPERTIES} -Dopenvidu.url=${OPENVIDU_URL}" -[ ! -z "${OPENVIDU_SECRET}" ] && JAVA_PROPERTIES=" ${JAVA_PROPERTIES} -Dopenvidu.secret=${OPENVIDU_SECRET}" -[ ! -z "${APP_PORT}" ] && JAVA_PROPERTIES=" ${JAVA_PROPERTIES} -Dserver.port=${APP_PORT}" - -java ${JAVA_PROPERTIES} -jar /opt/classroom-demo.jar diff --git a/docker/openvidu-demo-proxy/conf/default.conf b/docker/openvidu-demo-proxy/conf/default.conf index 49003be7..b56035b7 100644 --- a/docker/openvidu-demo-proxy/conf/default.conf +++ b/docker/openvidu-demo-proxy/conf/default.conf @@ -30,27 +30,27 @@ server { location /basic-videoconference { rewrite /basic-videoconference(.*) /$1 break; - proxy_pass url_ov_basic_videoconference; + proxy_pass url_ov_js_demo; } location /basic-screenshare { rewrite /basic-screenshare(.*) /$1 break; - proxy_pass url_ov_basic_screenshare; + proxy_pass url_ov_js_screenshare_demo; } location /basic-webinar { rewrite /basic-webinar(.*) /$1 break; - proxy_pass url_ov_basic_webinar; + proxy_pass url_ov_roles_java_demo; } location /getaroom { rewrite /getaroom(.*) /$1 break; - proxy_pass url_ov_getaroom; + proxy_pass url_ov_getaroom_demo; } location /classroom { rewrite /classroom(.*) $1 break; - proxy_pass url_ov_classroom; + proxy_pass url_ov_classroom_demo; } location /openvidu-call { diff --git a/docker/openvidu-demo-proxy/create_image.sh b/docker/openvidu-demo-proxy/create_image.sh index 1782b516..0a5832cb 100755 --- a/docker/openvidu-demo-proxy/create_image.sh +++ b/docker/openvidu-demo-proxy/create_image.sh @@ -1,3 +1,7 @@ #!/bin/bash +if [ $# -eq 0 ]; then + echo "No version argument provided. Usage: \"./create_images.sh X.Y.Z\"" + exit 1 +fi -docker build --pull --no-cache --rm=true -t openvidu/openvidu-demo-proxy . \ No newline at end of file +docker build --pull --no-cache --rm=true -t openvidu/openvidu-demo-proxy:"$1" . \ No newline at end of file diff --git a/docker/openvidu-demo-proxy/entrypoint.sh b/docker/openvidu-demo-proxy/entrypoint.sh index 4c8a616c..7a4f90c4 100644 --- a/docker/openvidu-demo-proxy/entrypoint.sh +++ b/docker/openvidu-demo-proxy/entrypoint.sh @@ -2,20 +2,20 @@ # Show input enviroment variables echo "Application server: ${URL_APPLICATION_SERVER}" -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-basic-videoconference: ${URL_OV_JS_DEMO}" +echo "openvidu-basic-screenshare: ${URL_OV_JS_SCREENSHARE_DEMO}" +echo "openvidu-basic-webinar: ${URL_OV_ROLES_JAVA_DEMO}" +echo "openvidu-classroom: ${URL_OV_CLASSROOM_DEMO}" +echo "openvidu-getaroom: ${URL_OV_GETAROOM_DEMO}" echo "openvidu-call: ${URL_OV_CALL}" # Load nginx conf files sed -i "s|url_application_server|${URL_APPLICATION_SERVER}|" /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_js_demo|${URL_OV_JS_DEMO}|" /etc/nginx/conf.d/default.conf +sed -i "s|url_ov_js_screenshare_demo|${URL_OV_JS_SCREENSHARE_DEMO}|" /etc/nginx/conf.d/default.conf +sed -i "s|url_ov_roles_java_demo|${URL_OV_ROLES_JAVA_DEMO}|" /etc/nginx/conf.d/default.conf +sed -i "s|url_ov_classroom_demo|${URL_OV_CLASSROOM_DEMO}|" /etc/nginx/conf.d/default.conf +sed -i "s|url_ov_getaroom_demo|${URL_OV_GETAROOM_DEMO}|" /etc/nginx/conf.d/default.conf sed -i "s|url_ov_call|${URL_OV_CALL}|" /etc/nginx/conf.d/default.conf cat > /tmp/redirect_index_to_domain.tpl <)[^<]+" "pom.xml") -docker build -f docker/Dockerfile -t openvidu/openvidu-basic-webinar-demo . -docker tag openvidu/openvidu-basic-webinar-demo:latest openvidu/openvidu-basic-webinar-demo:${SOFTWARE_VERSION} \ No newline at end of file +docker build -f docker/Dockerfile -t openvidu/openvidu-roles-java:"${1}" . \ No newline at end of file