From e5a8a172e6fe7ec0cf7f7f69f8c4bb590338128e Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Mon, 16 Nov 2020 15:06:53 +0100
Subject: [PATCH] Dockerfiles updated to Ubuntu 18.04 and Java 11
 (openvidu-server, openvidu-server-pro, openvidu-server-kms)

---
 .../docker/openvidu-server-kms/Dockerfile     | 29 ++++++++++++-------
 .../openvidu-server-kms/create_image.sh       | 13 +++++----
 .../docker/openvidu-server-pro/Dockerfile     |  6 ++--
 .../openvidu-server-pro/create_image.sh       |  2 --
 .../docker/openvidu-server/Dockerfile         |  6 ++--
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/openvidu-server/docker/openvidu-server-kms/Dockerfile b/openvidu-server/docker/openvidu-server-kms/Dockerfile
index 47fea732..58950dad 100644
--- a/openvidu-server/docker/openvidu-server-kms/Dockerfile
+++ b/openvidu-server/docker/openvidu-server-kms/Dockerfile
@@ -1,18 +1,23 @@
-FROM ubuntu:16.04
-MAINTAINER openvidu@gmail.com
+FROM ubuntu:18.04
+MAINTAINER info@openvidu.io
+
+# Update and install dependencies
+RUN apt-get update && apt-get -y upgrade && \
+	apt-get install -y gnupg2 && \
+	rm -rf /var/lib/apt/lists/*
 
 # Install Kurento Media Server (KMS)
-RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/6.15.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/*
+RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/6.15.0 bionic 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/*
 
 # Install Java, supervisor and netstat
 RUN apt-get update && apt-get install -y \
-  openjdk-8-jre \
-  supervisor \
-&& rm -rf /var/lib/apt/lists/*
+  openjdk-11-jre \
+  supervisor && \
+  rm -rf /var/lib/apt/lists/*
 
 # Configure supervisor
 RUN mkdir -p /var/log/supervisor
@@ -24,6 +29,10 @@ COPY openvidu-server.jar openvidu-server.jar
 # Copy KMS entrypoint
 COPY kms.sh /kms.sh
 
+# Cleanup
+RUN rm -rf /var/lib/apt/lists/* && \
+	apt-get autoremove --purge -y && apt-get autoclean
+
 EXPOSE 8888
 EXPOSE 9091
 EXPOSE 4443
diff --git a/openvidu-server/docker/openvidu-server-kms/create_image.sh b/openvidu-server/docker/openvidu-server-kms/create_image.sh
index 2f5c47f5..75610611 100755
--- a/openvidu-server/docker/openvidu-server-kms/create_image.sh
+++ b/openvidu-server/docker/openvidu-server-kms/create_image.sh
@@ -1,5 +1,8 @@
-cp ../../target/openvidu-server-"$1".jar ./openvidu-server.jar
-
-docker build -t openvidu/openvidu-server-kms .
-
-rm ./openvidu-server.jar
+VERSION=$1
+if [[ ! -z $VERSION ]]; then
+    cp ../../target/openvidu-server-*.jar ./openvidu-server.jar
+    docker build -t openvidu/openvidu-server-kms:$VERSION .
+    rm ./openvidu-server.jar
+else
+    echo "Error: You need to specify a version as first argument"
+fi
\ No newline at end of file
diff --git a/openvidu-server/docker/openvidu-server-pro/Dockerfile b/openvidu-server/docker/openvidu-server-pro/Dockerfile
index ed71196b..f85f777f 100644
--- a/openvidu-server/docker/openvidu-server-pro/Dockerfile
+++ b/openvidu-server/docker/openvidu-server-pro/Dockerfile
@@ -1,11 +1,11 @@
-FROM ubuntu:16.04
-MAINTAINER openvidu@gmail.com
+FROM ubuntu:18.04
+MAINTAINER info@openvidu.io
 
 # Install main components
 RUN apt-get update && apt-get install -y \
   curl \
   wget \
-  openjdk-8-jre \
+  openjdk-11-jre \
   coturn \
   redis-tools \
   jq \
diff --git a/openvidu-server/docker/openvidu-server-pro/create_image.sh b/openvidu-server/docker/openvidu-server-pro/create_image.sh
index 1a5e6430..82e6097d 100755
--- a/openvidu-server/docker/openvidu-server-pro/create_image.sh
+++ b/openvidu-server/docker/openvidu-server-pro/create_image.sh
@@ -1,9 +1,7 @@
 VERSION=$1
 if [[ ! -z $VERSION ]]; then
     cp ../utils/discover_my_public_ip.sh ./discover_my_public_ip.sh
-
     docker build -t openvidu/openvidu-server-pro:$VERSION .
-
     rm ./discover_my_public_ip.sh
 else
     echo "Error: You need to specify a version as first argument"
diff --git a/openvidu-server/docker/openvidu-server/Dockerfile b/openvidu-server/docker/openvidu-server/Dockerfile
index 8b23b3a7..b6bed77d 100644
--- a/openvidu-server/docker/openvidu-server/Dockerfile
+++ b/openvidu-server/docker/openvidu-server/Dockerfile
@@ -1,11 +1,11 @@
-FROM ubuntu:16.04
-MAINTAINER openvidu@gmail.com
+FROM ubuntu:18.04
+MAINTAINER info@openvidu.io
 
 # Install Java, supervisor and netstat
 RUN apt-get update && apt-get install -y \
   curl \
   wget \
-  openjdk-8-jre \
+  openjdk-11-jre \
   coturn \
   redis-tools \
   dnsutils \