From 90b143a9ecae4d2255331205e3eecbbeaeed2054 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Mon, 14 May 2018 12:16:20 +0200
Subject: [PATCH] openvidu-basic-videoconference Docker image update

---
 openvidu-js-java/docker/Dockerfile | 33 +++++++++++++++---------------
 openvidu-js-java/docker/kms.sh     | 19 ++++++++++-------
 openvidu-js-java/pom.xml           |  2 +-
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/openvidu-js-java/docker/Dockerfile b/openvidu-js-java/docker/Dockerfile
index 8b97b5cc..e87236cd 100644
--- a/openvidu-js-java/docker/Dockerfile
+++ b/openvidu-js-java/docker/Dockerfile
@@ -2,12 +2,13 @@ FROM ubuntu:16.04
 MAINTAINER openvidu@gmail.com
 
 # Install Kurento Media Server (KMS) 
-RUN echo "deb http://ubuntu.kurento.org xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \
- && apt-key adv --keyserver keyserver.ubuntu.com --recv 2F819BC0 \
- && apt-get update \
- && apt-get -y dist-upgrade \
- && apt-get -y install kurento-media-server-6.0 \
- && rm -rf /var/lib/apt/lists/*
+RUN echo "deb http://ubuntu.openvidu.io/6.7.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 dist-upgrade \
+    && apt-get -y install kurento-media-server \
+    && apt-get -y install openh264-gst-plugins-bad-1.5 \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY kms.sh /kms.sh
 COPY ngrok.sh /ngrok.sh
@@ -18,11 +19,11 @@ RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/li
 # 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
+    && 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
 
@@ -37,11 +38,11 @@ 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
+    && 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
diff --git a/openvidu-js-java/docker/kms.sh b/openvidu-js-java/docker/kms.sh
index 47324bf1..2e719e1b 100644
--- a/openvidu-js-java/docker/kms.sh
+++ b/openvidu-js-java/docker/kms.sh
@@ -1,14 +1,19 @@
 #!/bin/bash -x
 set -e
 
-if [ -n "$KMS_TURN_URL" ]; then
-  echo "turnURL=$KMS_TURN_URL" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
-fi
+KMS_STUN_IP_AUX="stun.l.google.com"
+KMS_STUN_PORT_AUX="19302"
 
 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
+    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
@@ -16,4 +21,4 @@ cat /etc/hosts | sed '/::1/d' | tee /etc/hosts > /dev/null
 
 export GST_DEBUG=Kurento*:5
 
-exec /usr/bin/kurento-media-server "$@"
+exec /usr/bin/kurento-media-server "$@"
\ No newline at end of file
diff --git a/openvidu-js-java/pom.xml b/openvidu-js-java/pom.xml
index 9c262d27..62941e83 100644
--- a/openvidu-js-java/pom.xml
+++ b/openvidu-js-java/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>io.openvidu</groupId>
 	<artifactId>openvidu-js-java</artifactId>
-	<version>1.1.0</version>
+	<version>2.0.0</version>
 	<packaging>jar</packaging>
 
 	<name>openvidu-js-java</name>