From a33266d34c671a0fe8380a91d0254f55aea520fd Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Sat, 28 Mar 2020 13:35:32 +0100 Subject: [PATCH] Removed deprecated Docker files --- openvidu-getaroom/docker/Dockerfile | 28 ------------------ openvidu-getaroom/docker/create_image.sh | 13 --------- openvidu-getaroom/docker/kms.sh | 24 ---------------- openvidu-getaroom/docker/supervisord.conf | 14 --------- openvidu-insecure-js/docker/Dockerfile | 28 ------------------ openvidu-insecure-js/docker/create_image.sh | 13 --------- openvidu-insecure-js/docker/kms.sh | 24 ---------------- openvidu-insecure-js/docker/supervisord.conf | 13 --------- openvidu-js-java/docker/Dockerfile | 30 -------------------- openvidu-js-java/docker/create_image.sh | 15 ---------- openvidu-js-java/docker/kms.sh | 24 ---------------- openvidu-js-java/docker/supervisord.conf | 20 ------------- 12 files changed, 246 deletions(-) delete mode 100644 openvidu-getaroom/docker/Dockerfile delete mode 100755 openvidu-getaroom/docker/create_image.sh delete mode 100644 openvidu-getaroom/docker/kms.sh delete mode 100644 openvidu-getaroom/docker/supervisord.conf delete mode 100644 openvidu-insecure-js/docker/Dockerfile delete mode 100755 openvidu-insecure-js/docker/create_image.sh delete mode 100644 openvidu-insecure-js/docker/kms.sh delete mode 100644 openvidu-insecure-js/docker/supervisord.conf delete mode 100644 openvidu-js-java/docker/Dockerfile delete mode 100755 openvidu-js-java/docker/create_image.sh delete mode 100644 openvidu-js-java/docker/kms.sh delete mode 100644 openvidu-js-java/docker/supervisord.conf diff --git a/openvidu-getaroom/docker/Dockerfile b/openvidu-getaroom/docker/Dockerfile deleted file mode 100644 index 8c5740a7..00000000 --- a/openvidu-getaroom/docker/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM ubuntu:16.04 -LABEL maintainer="openvidu@gmail.com" - -# Install Kurento Media Server (KMS) -RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/6.11.0 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 install kurento-media-server \ - && rm -rf /var/lib/apt/lists/* - -COPY kms.sh /kms.sh -COPY web /web/ - -# Install Java -RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/* - -# Configure Supervisor -RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/log/supervisor -COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf - -# Install OpenVidu Server -COPY openvidu-server.jar openvidu-server.jar - -EXPOSE 4443 - -# Exec supervisord -CMD ["/usr/bin/supervisord"] diff --git a/openvidu-getaroom/docker/create_image.sh b/openvidu-getaroom/docker/create_image.sh deleted file mode 100755 index 24a43e68..00000000 --- a/openvidu-getaroom/docker/create_image.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copy compiled openvidu-server.jar -cp ../../../openvidu/openvidu-server/target/openvidu-server-"$1".jar ./openvidu-server.jar - -# Copy openvidu-insecure-js web files -cp -a ../web/. ./web/ - -# Build docker image -docker build -t openvidu/getaroom-demo . - -# Delete unwanted files -rm -rf ./web -rm -rf ./openvidu-server -rm openvidu-server.jar diff --git a/openvidu-getaroom/docker/kms.sh b/openvidu-getaroom/docker/kms.sh deleted file mode 100644 index 2e719e1b..00000000 --- a/openvidu-getaroom/docker/kms.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -x -set -e - -KMS_STUN_IP_AUX="stun.l.google.com" -KMS_STUN_PORT_AUX="19302" - -if [ -n "$KMS_STUN_IP" -a -n "$KMS_STUN_PORT" ]; then - KMS_STUN_IP_AUX="${KMS_STUN_IP}" - KMS_STUN_PORT_AUX="${KMS_STUN_PORT}" -fi - -# Generate WebRtcEndpoint configuration -echo "stunServerAddress=$KMS_STUN_IP_AUX" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini -echo "stunServerPort=$KMS_STUN_PORT_AUX" >> /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini -if [ -n "$KMS_TURN_URL" ]; then - echo "turnURL=$KMS_TURN_URL" >> /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 "$@" \ No newline at end of file diff --git a/openvidu-getaroom/docker/supervisord.conf b/openvidu-getaroom/docker/supervisord.conf deleted file mode 100644 index b5ce183b..00000000 --- a/openvidu-getaroom/docker/supervisord.conf +++ /dev/null @@ -1,14 +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:openvidu-server] -command=/bin/bash -c "java -Dsecurity.ignored=/** -Dspring.resources.static-locations=file:///web/ -jar /openvidu-server.jar" -redirect_stderr=true - diff --git a/openvidu-insecure-js/docker/Dockerfile b/openvidu-insecure-js/docker/Dockerfile deleted file mode 100644 index 8c5740a7..00000000 --- a/openvidu-insecure-js/docker/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM ubuntu:16.04 -LABEL maintainer="openvidu@gmail.com" - -# Install Kurento Media Server (KMS) -RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/6.11.0 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 install kurento-media-server \ - && rm -rf /var/lib/apt/lists/* - -COPY kms.sh /kms.sh -COPY web /web/ - -# Install Java -RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/* - -# Configure Supervisor -RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/log/supervisor -COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf - -# Install OpenVidu Server -COPY openvidu-server.jar openvidu-server.jar - -EXPOSE 4443 - -# Exec supervisord -CMD ["/usr/bin/supervisord"] diff --git a/openvidu-insecure-js/docker/create_image.sh b/openvidu-insecure-js/docker/create_image.sh deleted file mode 100755 index 59f7deac..00000000 --- a/openvidu-insecure-js/docker/create_image.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copy compiled openvidu-server.jar -cp ../../../openvidu/openvidu-server/target/openvidu-server-"$1".jar ./openvidu-server.jar - -# Copy openvidu-insecure-js web files -cp -a ../web/. ./web/ - -# Build docker image -docker build -t openvidu/basic-videoconference-demo . - -# Delete unwanted files -rm -rf ./web -rm -rf ./openvidu-server -rm openvidu-server.jar diff --git a/openvidu-insecure-js/docker/kms.sh b/openvidu-insecure-js/docker/kms.sh deleted file mode 100644 index 2e719e1b..00000000 --- a/openvidu-insecure-js/docker/kms.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -x -set -e - -KMS_STUN_IP_AUX="stun.l.google.com" -KMS_STUN_PORT_AUX="19302" - -if [ -n "$KMS_STUN_IP" -a -n "$KMS_STUN_PORT" ]; then - KMS_STUN_IP_AUX="${KMS_STUN_IP}" - KMS_STUN_PORT_AUX="${KMS_STUN_PORT}" -fi - -# Generate WebRtcEndpoint configuration -echo "stunServerAddress=$KMS_STUN_IP_AUX" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini -echo "stunServerPort=$KMS_STUN_PORT_AUX" >> /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini -if [ -n "$KMS_TURN_URL" ]; then - echo "turnURL=$KMS_TURN_URL" >> /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 "$@" \ No newline at end of file diff --git a/openvidu-insecure-js/docker/supervisord.conf b/openvidu-insecure-js/docker/supervisord.conf deleted file mode 100644 index de739bf6..00000000 --- a/openvidu-insecure-js/docker/supervisord.conf +++ /dev/null @@ -1,13 +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:openvidu-server] -command=/bin/bash -c "java -Dsecurity.ignored=/** -Dspring.resources.static-locations=file:///web/ -jar /openvidu-server.jar" -redirect_stderr=true diff --git a/openvidu-js-java/docker/Dockerfile b/openvidu-js-java/docker/Dockerfile deleted file mode 100644 index 6479b698..00000000 --- a/openvidu-js-java/docker/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM ubuntu:16.04 -LABEL maintainer="openvidu@gmail.com" - -# Install Kurento Media Server (KMS) -RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/6.11.0 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 install kurento-media-server \ - && rm -rf /var/lib/apt/lists/* - -COPY kms.sh /kms.sh - -# Install Java -RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/* - -# Configure Supervisor -RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/log/supervisor -COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf - -COPY openvidu-server.jar openvidu-server.jar -COPY openvidu-js-java.jar app.jar -RUN sh -c 'touch /openvidu-server.jar' -RUN sh -c 'touch /app.jar' - -EXPOSE 5000 -EXPOSE 4443 - -# Exec supervisord -CMD ["/usr/bin/supervisord"] diff --git a/openvidu-js-java/docker/create_image.sh b/openvidu-js-java/docker/create_image.sh deleted file mode 100755 index e5c83d6f..00000000 --- a/openvidu-js-java/docker/create_image.sh +++ /dev/null @@ -1,15 +0,0 @@ -# Build and package openvidu-js-java maven project -cd .. && mvn clean compile package - -# Copy openvidu-js-java.jar in docker build path -cp target/openvidu-js-java-"$1".jar ./docker/openvidu-js-java.jar - -# Copy compiled openvidu-server.jar -cd ./docker && cp ../../../openvidu/openvidu-server/target/openvidu-server-"$1".jar ./openvidu-server.jar - -### Build Docker container and remove unwanted files ### -docker build -t openvidu/basic-webinar-demo . - -rm ./openvidu-js-java.jar -rm ./openvidu-server.jar -rm -rf ./openvidu-server diff --git a/openvidu-js-java/docker/kms.sh b/openvidu-js-java/docker/kms.sh deleted file mode 100644 index 2e719e1b..00000000 --- a/openvidu-js-java/docker/kms.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -x -set -e - -KMS_STUN_IP_AUX="stun.l.google.com" -KMS_STUN_PORT_AUX="19302" - -if [ -n "$KMS_STUN_IP" -a -n "$KMS_STUN_PORT" ]; then - KMS_STUN_IP_AUX="${KMS_STUN_IP}" - KMS_STUN_PORT_AUX="${KMS_STUN_PORT}" -fi - -# Generate WebRtcEndpoint configuration -echo "stunServerAddress=$KMS_STUN_IP_AUX" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini -echo "stunServerPort=$KMS_STUN_PORT_AUX" >> /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini -if [ -n "$KMS_TURN_URL" ]; then - echo "turnURL=$KMS_TURN_URL" >> /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 "$@" \ No newline at end of file diff --git a/openvidu-js-java/docker/supervisord.conf b/openvidu-js-java/docker/supervisord.conf deleted file mode 100644 index bdbfcabd..00000000 --- a/openvidu-js-java/docker/supervisord.conf +++ /dev/null @@ -1,20 +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 -priority=2 - -[program:openvidu-server] -command=/bin/bash -c "java -jar /openvidu-server.jar" -redirect_stderr=true -priority=3 - -[program:openvidu-js-java] -command=/bin/bash -c "java -Djava.security.egd=file:/dev/./urandom -jar /app.jar" -redirect_stderr=true -priority=4