From 57401acf2b69f16d10954ab0dc7841ae0fee201a Mon Sep 17 00:00:00 2001 From: cruizba Date: Mon, 19 Sep 2022 17:56:15 +0200 Subject: [PATCH] deployment: Remove docker of openvidu-test-app. Update openvidu-dev to 6.18.0 --- .../docker/openvidu-dev/Dockerfile | 2 +- .../docker/openvidu-dev/create_image.sh | 1 + openvidu-testapp/docker/Dockerfile | 33 ------------------- openvidu-testapp/docker/create_image.sh | 21 ------------ openvidu-testapp/docker/kms.sh | 19 ----------- openvidu-testapp/docker/supervisord.conf | 17 ---------- 6 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 openvidu-testapp/docker/Dockerfile delete mode 100755 openvidu-testapp/docker/create_image.sh delete mode 100644 openvidu-testapp/docker/kms.sh delete mode 100644 openvidu-testapp/docker/supervisord.conf diff --git a/openvidu-server/docker/openvidu-dev/Dockerfile b/openvidu-server/docker/openvidu-dev/Dockerfile index 05b066fd..7a7bf6b3 100644 --- a/openvidu-server/docker/openvidu-dev/Dockerfile +++ b/openvidu-server/docker/openvidu-dev/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && apt-get -y upgrade && \ rm -rf /var/lib/apt/lists/* # Install Kurento Media Server (KMS) -RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/dev bionic kms6" | tee /etc/apt/sources.list.d/kurento.list && \ +RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/6.18.0 bionic kms6" | tee /etc/apt/sources.list.d/kurento.list && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5AFA7A83 && \ apt-get update && \ apt-get -y install kurento-media-server && \ diff --git a/openvidu-server/docker/openvidu-dev/create_image.sh b/openvidu-server/docker/openvidu-dev/create_image.sh index 92d4079c..9866b6e0 100755 --- a/openvidu-server/docker/openvidu-dev/create_image.sh +++ b/openvidu-server/docker/openvidu-dev/create_image.sh @@ -1,3 +1,4 @@ +#!/bin/bash VERSION=$1 if [[ ! -z $VERSION ]]; then cp ../../target/openvidu-server-*.jar ./openvidu-server.jar diff --git a/openvidu-testapp/docker/Dockerfile b/openvidu-testapp/docker/Dockerfile deleted file mode 100644 index da002e91..00000000 --- a/openvidu-testapp/docker/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM ubuntu:16.04 -MAINTAINER info@openvidu.io - -# Install Kurento Media Server (KMS) -RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/6.7.2 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \ - && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5AFA7A83 \ - && apt-get update \ - && apt-get -y dist-upgrade \ - && apt-get -y install kurento-media-server \ - && apt-get -y install openh264-gst-plugins-bad-1.5 - -# Install Java -RUN apt-get install -y openjdk-8-jdk - -# Install npm and http-server -RUN apt-get -y install curl && apt-get update && curl -sL https://deb.nodesource.com/setup_8.x | bash - -RUN apt-get install -y nodejs -RUN npm install -g http-server - -# Configure Supervisor -RUN mkdir -p /var/log/supervisor -RUN apt-get install -y supervisor && rm -rf /var/lib/apt/lists/* - -# Copy all files -COPY kms.sh /kms.sh -COPY web /web/ -COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf -COPY openvidu-server.jar openvidu-server.jar - -EXPOSE 4443 - -# Exec supervisord -CMD ["/usr/bin/supervisord"] diff --git a/openvidu-testapp/docker/create_image.sh b/openvidu-testapp/docker/create_image.sh deleted file mode 100755 index 6430e59c..00000000 --- a/openvidu-testapp/docker/create_image.sh +++ /dev/null @@ -1,21 +0,0 @@ -# Copy compiled openvidu-server.jar -cp ../../openvidu-server/target/openvidu-server-"$1".jar ./openvidu-server.jar - -# Build and copy openvidu-testapp static files -cd ../ -ng build --prod -cp -a dist/. ./docker/web/ -cd docker/web -openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -subj '/CN=www.mydom.com/O=My Company LTD./C=US' -keyout key.pem -out cert.pem -openssl pkcs12 -export -in cert.pem -inkey key.pem -out keystore.p12 -password pass:CERT_PASS -name CERT_ALIAS -CAfile cert.pem -keytool -importkeystore -srckeystore keystore.p12 -srcstoretype PKCS12 -deststorepass CERT_PASS -srcstorepass CERT_PASS -destkeystore NEW.jks -deststoretype JKS -cd .. - - -# Build docker image -docker build -t openvidu/testapp . - -# Delete unwanted files -rm -rf ./web -rm -rf ./openvidu-server -rm openvidu-server.jar diff --git a/openvidu-testapp/docker/kms.sh b/openvidu-testapp/docker/kms.sh deleted file mode 100644 index 47324bf1..00000000 --- a/openvidu-testapp/docker/kms.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -x -set -e - -if [ -n "$KMS_TURN_URL" ]; then - echo "turnURL=$KMS_TURN_URL" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini -fi - -if [ -n "$KMS_STUN_IP" -a -n "$KMS_STUN_PORT" ]; then - # Generate WebRtcEndpoint configuration - echo "stunServerAddress=$KMS_STUN_IP" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini - echo "stunServerPort=$KMS_STUN_PORT" >> /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini -fi - -# Remove ipv6 local loop until ipv6 is supported -cat /etc/hosts | sed '/::1/d' | tee /etc/hosts > /dev/null - -export GST_DEBUG=Kurento*:5 - -exec /usr/bin/kurento-media-server "$@" diff --git a/openvidu-testapp/docker/supervisord.conf b/openvidu-testapp/docker/supervisord.conf deleted file mode 100644 index a0952b6e..00000000 --- a/openvidu-testapp/docker/supervisord.conf +++ /dev/null @@ -1,17 +0,0 @@ -[supervisord] -nodaemon=true -logfile=/var/log/supervisor/supervisord.log; -pidfile=/var/run/supervisord.pid; -loglevel=debug - -[program:kms] -command=/bin/bash /kms.sh -redirect_stderr=true - -[program:testapp] -command=/bin/bash -c "http-server -S -C /web/cert.pem -K /web/key.pem -p 5000 /web" -redirect_stderr=true - -[program:openvidu-server] -command=/bin/bash -c "java -Dserver.port=4443 -Dsecurity.ignored=/** -Dopenvidu.recording=true -Dopenvidu.recording.path=/opt/openvidu/recordings -Dopenvidu.recording.public-access=true -Dserver.ssl.key-store=/web/NEW.jks -Dserver.ssl.key-store-password=CERT_PASS -Dserver.ssl.key-alias=CERT_ALIAS -jar /openvidu-server.jar" -redirect_stderr=true