diff --git a/openvidu-getaroom/docker/Dockerfile b/openvidu-getaroom/docker/Dockerfile index d1d7fc80..f1217487 100644 --- a/openvidu-getaroom/docker/Dockerfile +++ b/openvidu-getaroom/docker/Dockerfile @@ -1,48 +1,28 @@ FROM ubuntu:16.04 -MAINTAINER openvidu@gmail.com +LABEL maintainer="openvidu@gmail.com" # Install Kurento Media Server (KMS) -RUN echo "deb http://ubuntu.openvidu.io/6.8.0 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \ +RUN echo "deb http://ubuntu.openvidu.io/6.9.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 ngrok.sh /ngrok.sh COPY web /web/ # Install Java RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/* -# ngrok -RUN apt-get update && apt-get install unzip -RUN set -x \ - && apt-get update \ - && apt-get install wget \ - && wget https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip \ - && unzip ngrok-stable-linux-amd64.zip -d /home/ngrok \ - && rm -f ngrok-stable-linux-amd64.zip ngrok - -COPY ngrok.yml /home/ngrok/ngrok.yml - # 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 -RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/* # Install OpenVidu Server COPY openvidu-server.jar openvidu-server.jar -RUN set -x \ - && echo 'ngrok:x:6737:6737:Ngrok user:/home/ngrok:/bin/false' >> /etc/passwd \ - && echo 'ngrok:x:6737:' >> /etc/group \ - && chown ngrok:ngrok /home/ngrok \ - && chmod -R go=u,go-w /home/ngrok \ - && chmod go= /home/ngrok - EXPOSE 4443 -EXPOSE 4040 # Exec supervisord CMD ["/usr/bin/supervisord"] diff --git a/openvidu-getaroom/docker/create_image.sh b/openvidu-getaroom/docker/create_image.sh index 25cf7a99..24a43e68 100755 --- a/openvidu-getaroom/docker/create_image.sh +++ b/openvidu-getaroom/docker/create_image.sh @@ -4,9 +4,6 @@ cp ../../../openvidu/openvidu-server/target/openvidu-server-"$1".jar ./openvidu- # Copy openvidu-insecure-js web files cp -a ../web/. ./web/ -# Modify OpenVidu Server URL -sed -i 's/var OPENVIDU_SERVER_URL = "https:\/\/" + location\.hostname + ":4443";/var OPENVIDU_SERVER_URL = "https:\/\/" + location\.hostname;/g' ./web/app.js - # Build docker image docker build -t openvidu/getaroom-demo . diff --git a/openvidu-getaroom/docker/ngrok.sh b/openvidu-getaroom/docker/ngrok.sh deleted file mode 100644 index cda96267..00000000 --- a/openvidu-getaroom/docker/ngrok.sh +++ /dev/null @@ -1,6 +0,0 @@ -exec $HOME/ngrok start --all -config=$HOME/ngrok.yml > $HOME/ngrok.log & -while true -do - sleep 100000 -done -exit 0 diff --git a/openvidu-getaroom/docker/ngrok.yml b/openvidu-getaroom/docker/ngrok.yml deleted file mode 100644 index 68418d8f..00000000 --- a/openvidu-getaroom/docker/ngrok.yml +++ /dev/null @@ -1,5 +0,0 @@ -web_addr: 0.0.0.0:4040 -tunnels: - app: - addr: 4443 - proto: http diff --git a/openvidu-getaroom/docker/supervisord.conf b/openvidu-getaroom/docker/supervisord.conf index 6a30c0d0..b5ce183b 100644 --- a/openvidu-getaroom/docker/supervisord.conf +++ b/openvidu-getaroom/docker/supervisord.conf @@ -9,10 +9,6 @@ command=/bin/bash /kms.sh redirect_stderr=true [program:openvidu-server] -command=/bin/bash -c "java -Dspring.profiles.active=ngrok -Dserver.port=4443 -Dsecurity.ignored=/** -Dspring.resources.static-locations=file:///web/ -jar /openvidu-server.jar" +command=/bin/bash -c "java -Dsecurity.ignored=/** -Dspring.resources.static-locations=file:///web/ -jar /openvidu-server.jar" redirect_stderr=true -[program:ngrok] -environment=HOME="/home/ngrok",USER="ngrok" -command=/bin/bash /ngrok.sh -redirect_stderr=true diff --git a/openvidu-insecure-js/docker/Dockerfile b/openvidu-insecure-js/docker/Dockerfile index 430f6e10..f1217487 100644 --- a/openvidu-insecure-js/docker/Dockerfile +++ b/openvidu-insecure-js/docker/Dockerfile @@ -1,47 +1,27 @@ FROM ubuntu:16.04 -MAINTAINER openvidu@gmail.com +LABEL maintainer="openvidu@gmail.com" # Install Kurento Media Server (KMS) -RUN echo "deb http://ubuntu.openvidu.io/6.8.0 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \ +RUN echo "deb http://ubuntu.openvidu.io/6.9.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 ngrok.sh /ngrok.sh COPY web /web/ # Install Java RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/* -# ngrok -RUN apt-get update && apt-get install unzip -RUN set -x \ - && apt-get update \ - && apt-get install wget \ - && wget https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip \ - && unzip ngrok-stable-linux-amd64.zip -d /home/ngrok \ - && rm -f ngrok-stable-linux-amd64.zip ngrok - -COPY ngrok.yml /home/ngrok/ngrok.yml - # 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 -RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/* # Install OpenVidu Server COPY openvidu-server.jar openvidu-server.jar -RUN set -x \ - && echo 'ngrok:x:6737:6737:Ngrok user:/home/ngrok:/bin/false' >> /etc/passwd \ - && echo 'ngrok:x:6737:' >> /etc/group \ - && chown ngrok:ngrok /home/ngrok \ - && chmod -R go=u,go-w /home/ngrok \ - && chmod go= /home/ngrok - -EXPOSE 4040 EXPOSE 4443 # Exec supervisord diff --git a/openvidu-insecure-js/docker/create_image.sh b/openvidu-insecure-js/docker/create_image.sh index 44858f04..59f7deac 100755 --- a/openvidu-insecure-js/docker/create_image.sh +++ b/openvidu-insecure-js/docker/create_image.sh @@ -4,9 +4,6 @@ cp ../../../openvidu/openvidu-server/target/openvidu-server-"$1".jar ./openvidu- # Copy openvidu-insecure-js web files cp -a ../web/. ./web/ -# Modify OpenVidu Server URL -sed -i 's/var OPENVIDU_SERVER_URL = "https:\/\/" + location\.hostname + ":4443";/var OPENVIDU_SERVER_URL = "https:\/\/" + location\.hostname;/g' ./web/app.js - # Build docker image docker build -t openvidu/basic-videoconference-demo . diff --git a/openvidu-insecure-js/docker/ngrok.sh b/openvidu-insecure-js/docker/ngrok.sh deleted file mode 100644 index cda96267..00000000 --- a/openvidu-insecure-js/docker/ngrok.sh +++ /dev/null @@ -1,6 +0,0 @@ -exec $HOME/ngrok start --all -config=$HOME/ngrok.yml > $HOME/ngrok.log & -while true -do - sleep 100000 -done -exit 0 diff --git a/openvidu-insecure-js/docker/ngrok.yml b/openvidu-insecure-js/docker/ngrok.yml deleted file mode 100644 index 68418d8f..00000000 --- a/openvidu-insecure-js/docker/ngrok.yml +++ /dev/null @@ -1,5 +0,0 @@ -web_addr: 0.0.0.0:4040 -tunnels: - app: - addr: 4443 - proto: http diff --git a/openvidu-insecure-js/docker/supervisord.conf b/openvidu-insecure-js/docker/supervisord.conf index 6a30c0d0..de739bf6 100644 --- a/openvidu-insecure-js/docker/supervisord.conf +++ b/openvidu-insecure-js/docker/supervisord.conf @@ -9,10 +9,5 @@ command=/bin/bash /kms.sh redirect_stderr=true [program:openvidu-server] -command=/bin/bash -c "java -Dspring.profiles.active=ngrok -Dserver.port=4443 -Dsecurity.ignored=/** -Dspring.resources.static-locations=file:///web/ -jar /openvidu-server.jar" -redirect_stderr=true - -[program:ngrok] -environment=HOME="/home/ngrok",USER="ngrok" -command=/bin/bash /ngrok.sh +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 index 0b75838e..47af53e4 100644 --- a/openvidu-js-java/docker/Dockerfile +++ b/openvidu-js-java/docker/Dockerfile @@ -1,50 +1,30 @@ FROM ubuntu:16.04 -MAINTAINER openvidu@gmail.com +LABEL maintainer="openvidu@gmail.com" # Install Kurento Media Server (KMS) -RUN echo "deb http://ubuntu.openvidu.io/6.8.0 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \ +RUN echo "deb http://ubuntu.openvidu.io/6.9.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 ngrok.sh /ngrok.sh # Install Java RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/* -# ngrok -RUN apt-get update && apt-get install unzip -RUN set -x \ - && apt-get update \ - && apt-get install wget \ - && wget https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip \ - && unzip ngrok-stable-linux-amd64.zip -d /home/ngrok \ - && rm -f ngrok-stable-linux-amd64.zip ngrok - -COPY ngrok.yml /home/ngrok/ngrok.yml - # 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 -RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/* 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' -RUN set -x \ - && echo 'ngrok:x:6737:6737:Ngrok user:/home/ngrok:/bin/false' >> /etc/passwd \ - && echo 'ngrok:x:6737:' >> /etc/group \ - && chown ngrok:ngrok /home/ngrok \ - && chmod -R go=u,go-w /home/ngrok \ - && chmod go= /home/ngrok - -EXPOSE 3000 EXPOSE 5000 -EXPOSE 4040 +EXPOSE 4443 # Exec supervisord CMD ["/usr/bin/supervisord"] diff --git a/openvidu-js-java/docker/ngrok.sh b/openvidu-js-java/docker/ngrok.sh deleted file mode 100644 index cda96267..00000000 --- a/openvidu-js-java/docker/ngrok.sh +++ /dev/null @@ -1,6 +0,0 @@ -exec $HOME/ngrok start --all -config=$HOME/ngrok.yml > $HOME/ngrok.log & -while true -do - sleep 100000 -done -exit 0 diff --git a/openvidu-js-java/docker/ngrok.yml b/openvidu-js-java/docker/ngrok.yml deleted file mode 100644 index 3f52cb9e..00000000 --- a/openvidu-js-java/docker/ngrok.yml +++ /dev/null @@ -1,8 +0,0 @@ -web_addr: 0.0.0.0:4040 -tunnels: - app: - addr: 3000 - proto: http - server: - addr: 5000 - proto: http diff --git a/openvidu-js-java/docker/supervisord.conf b/openvidu-js-java/docker/supervisord.conf index 6b77bbc1..bdbfcabd 100644 --- a/openvidu-js-java/docker/supervisord.conf +++ b/openvidu-js-java/docker/supervisord.conf @@ -10,17 +10,11 @@ redirect_stderr=true priority=2 [program:openvidu-server] -command=/bin/bash -c "java -Dspring.profiles.active=ngrok -jar /openvidu-server.jar" +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 -Dspring.profiles.active=container -jar /app.jar" +command=/bin/bash -c "java -Djava.security.egd=file:/dev/./urandom -jar /app.jar" redirect_stderr=true priority=4 - -[program:ngrok] -environment=HOME="/home/ngrok",USER="ngrok" -command=/bin/bash /ngrok.sh -redirect_stderr=true -priority=1 diff --git a/openvidu-js-java/pom.xml b/openvidu-js-java/pom.xml index c3b8993a..b7118203 100644 --- a/openvidu-js-java/pom.xml +++ b/openvidu-js-java/pom.xml @@ -4,7 +4,7 @@ io.openvidu openvidu-js-java - 2.5.0 + 2.7.0 jar openvidu-js-java diff --git a/openvidu-js-java/src/main/resources/application-container.properties b/openvidu-js-java/src/main/resources/application-container.properties deleted file mode 100644 index 8a4b7c07..00000000 --- a/openvidu-js-java/src/main/resources/application-container.properties +++ /dev/null @@ -1,8 +0,0 @@ -spring.profiles.active=container - -server.port: 3000 -server.ssl.enabled: false - -openvidu.url: http://localhost:5000/ -openvidu.secret: MY_SECRET -openvidu.publicurl: ngrok