Now insecure containers build with compiled openvidu-server.jar. localhost connections works on all Docker containers demos

This commit is contained in:
pabloFuente 2017-09-18 17:16:31 +02:00
parent 24dfbc118a
commit 252d6359a1
7 changed files with 19 additions and 35 deletions

View File

@ -11,6 +11,7 @@ RUN echo "deb http://ubuntu.kurento.org xenial kms6" | tee /etc/apt/sources.list
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/*

View File

@ -1,23 +1,16 @@
# Copy openvidu-server project except angular-cli project ('frontend' folder)
rsync -ax --exclude='**/angular' --exclude='**/static' ../../../openvidu/openvidu-server .
# Copy compiled openvidu-server.jar
cp ../../../openvidu/openvidu-server/target/openvidu-server-"$1".jar ./openvidu-server.jar
# Comment root path Basic Authorization in SecurityConfig.java
sed -i 's/\.antMatchers(\"\/\").authenticated()/\/\/.antMatchers(\"\/\").authenticated()/g' ./openvidu-server/src/main/java/io/openvidu/server/security/SecurityConfig.java
# Copy openvidu-insecure-js web files
cp -a ../web/. ./web/
# Copy plainjs-demo web files into static folder of openvidu-server project
cp -a ../web/. ./openvidu-server/src/main/resources/static/
# Build and package maven project
cd openvidu-server
mvn clean compile package -DskipTests=true
# Copy .jar in docker build path
cp target/openvidu-server-"$1".jar ../openvidu-server.jar
# Modify WebSocket protocol in app.js for allowing both ngrok and localhost connections
sed -i 's/OV\.initSession("wss:\/\/"/OV\.initSession("ws:\/\/"/g' ./web/app.js
# Build docker image
cd ..
docker build -t openvidu/getaroom-demo .
# Delete unwanted files
rm -rf ./web
rm -rf ./openvidu-server
rm openvidu-server.jar

View File

@ -9,7 +9,7 @@ command=/bin/bash /kms.sh
redirect_stderr=true
[program:openvidu-server]
command=/bin/bash -c "java -Dspring.profiles.active=ngrok -Dserver.port=8443 -jar /openvidu-server.jar"
command=/bin/bash -c "java -Dspring.profiles.active=ngrok -Dserver.port=8443 -Dsecurity.ignored=/** -Dspring.resources.static-locations=file:///web/ -jar /openvidu-server.jar"
redirect_stderr=true
[program:ngrok]

View File

@ -11,6 +11,7 @@ RUN echo "deb http://ubuntu.kurento.org xenial kms6" | tee /etc/apt/sources.list
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/*
@ -41,7 +42,6 @@ RUN set -x \
&& chmod -R go=u,go-w /home/ngrok \
&& chmod go= /home/ngrok
EXPOSE 5000
EXPOSE 4040
EXPOSE 8443

View File

@ -1,26 +1,16 @@
# Copy openvidu-server project except angular-cli project ('frontend' folder)
rsync -ax --exclude='**/angular' --exclude='**/static' ../../../openvidu/openvidu-server .
# Copy compiled openvidu-server.jar
cp ../../../openvidu/openvidu-server/target/openvidu-server-"$1".jar ./openvidu-server.jar
# Comment root path Basic Authorization in SecurityConfig.java
sed -i 's/\.antMatchers(\"\/\").authenticated()/\/\/.antMatchers(\"\/\").authenticated()/g' ./openvidu-server/src/main/java/io/openvidu/server/security/SecurityConfig.java
# Copy openvidu-insecure-js web files
cp -a ../web/. ./web/
# Copy plainjs-demo web files into static folder of openvidu-server project
cp -a ../web/. ./openvidu-server/src/main/resources/static/
# Change port and protocol in URL param of new OpenVidu object in app.js
#sed -i 's/\OV.initSession(\"wss:\/\/\" + location.hostname + \":8443\/\"/OV.initSession(\"wss:\/\/\" + location.hostname + \"\/\"/g' ./openvidu-server/src/main/resources/static/app.js
# Build and package maven project
cd openvidu-server
mvn clean compile package -DskipTests=true
# Copy .jar in docker build path
cp target/openvidu-server-"$1".jar ../openvidu-server.jar
# Modify WebSocket protocol in app.js for allowing both ngrok and localhost connections
sed -i 's/OV\.initSession("wss:\/\/"/OV\.initSession("ws:\/\/"/g' ./web/app.js
# Build docker image
cd ..
docker build -t openvidu/basic-videoconference-demo .
# Delete unwanted files
rm -rf ./web
rm -rf ./openvidu-server
rm openvidu-server.jar

View File

@ -1,5 +1,5 @@
web_addr: 0.0.0.0:4040
tunnels:
app:
addr: 5000
addr: 8443
proto: http

View File

@ -9,7 +9,7 @@ command=/bin/bash /kms.sh
redirect_stderr=true
[program:openvidu-server]
command=/bin/bash -c "java -Dspring.profiles.active=ngrok -jar /openvidu-server.jar"
command=/bin/bash -c "java -Dspring.profiles.active=ngrok -Dserver.port=8443 -Dsecurity.ignored=/** -Dspring.resources.static-locations=file:///web/ -jar /openvidu-server.jar"
redirect_stderr=true
[program:ngrok]