neoris/openvidu-livekit-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ngrok removed from docker containers (getaroom, insecure-js, js-java)

Browse Source
This commit is contained in:
pabloFuente 2019-01-10 14:19:39 +01:00
parent ffbda20062
commit c9843ac2b3
16 changed files with 15 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openvidu-getaroom/docker/Dockerfile
View File

@ -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"]

3
openvidu-getaroom/docker/create_image.sh
View File

@ -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 .

6
openvidu-getaroom/docker/ngrok.sh
View File

@ -1,6 +0,0 @@
exec $HOME/ngrok start --all -config=$HOME/ngrok.yml > $HOME/ngrok.log &
while true
do
sleep 100000
done
exit 0

5
openvidu-getaroom/docker/ngrok.yml
View File

@ -1,5 +0,0 @@
web_addr: 0.0.0.0:4040
tunnels:
app:
addr: 4443
proto: http

6
openvidu-getaroom/docker/supervisord.conf
View File

@ -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

26
openvidu-insecure-js/docker/Dockerfile
View File

@ -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

3
openvidu-insecure-js/docker/create_image.sh
View File

@ -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 .

6
openvidu-insecure-js/docker/ngrok.sh
View File

@ -1,6 +0,0 @@
exec $HOME/ngrok start --all -config=$HOME/ngrok.yml > $HOME/ngrok.log &
while true
do
sleep 100000
done
exit 0

5
openvidu-insecure-js/docker/ngrok.yml
View File

@ -1,5 +0,0 @@
web_addr: 0.0.0.0:4040
tunnels:
app:
addr: 4443
proto: http

7
openvidu-insecure-js/docker/supervisord.conf
View File

@ -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

28
openvidu-js-java/docker/Dockerfile
View File

@ -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"]

6
openvidu-js-java/docker/ngrok.sh
View File

@ -1,6 +0,0 @@
exec $HOME/ngrok start --all -config=$HOME/ngrok.yml > $HOME/ngrok.log &
while true
do
sleep 100000
done
exit 0

8
openvidu-js-java/docker/ngrok.yml
View File

@ -1,8 +0,0 @@
web_addr: 0.0.0.0:4040
tunnels:
app:
addr: 3000
proto: http
server:
addr: 5000
proto: http

10
openvidu-js-java/docker/supervisord.conf
View File

@ -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

2
openvidu-js-java/pom.xml
View File

@ -4,7 +4,7 @@
<groupId>io.openvidu</groupId>
<artifactId>openvidu-js-java</artifactId>
<version>2.5.0</version>
<version>2.7.0</version>
<packaging>jar</packaging>
<name>openvidu-js-java</name>

8
openvidu-js-java/src/main/resources/application-container.properties
View File

@ -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