From edf1c70cf380450ce9c44c5a1d866971e48556da Mon Sep 17 00:00:00 2001
From: micaelgallego <micael.gallego@gmail.com>
Date: Sun, 29 Mar 2020 01:09:12 +0100
Subject: [PATCH] Improve openvidu-server docker img creation

---
 openvidu-server/docker/openvidu-server/Dockerfile       | 8 +-------
 openvidu-server/docker/openvidu-server/create_image.sh  | 2 +-
 openvidu-server/docker/openvidu-server/supervisord.conf | 9 ---------
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 openvidu-server/docker/openvidu-server/supervisord.conf

diff --git a/openvidu-server/docker/openvidu-server/Dockerfile b/openvidu-server/docker/openvidu-server/Dockerfile
index 2038989e..2c0fbf14 100644
--- a/openvidu-server/docker/openvidu-server/Dockerfile
+++ b/openvidu-server/docker/openvidu-server/Dockerfile
@@ -4,19 +4,13 @@ MAINTAINER openvidu@gmail.com
 # Install Java, supervisor and netstat
 RUN apt-get update && apt-get install -y \
   openjdk-8-jre \
-  supervisor \
   coturn \
 && rm -rf /var/lib/apt/lists/*
 
-# Configure supervisor
-RUN mkdir -p /var/log/supervisor
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
 # Copy OpenVidu Server
 COPY openvidu-server.jar /
 
 EXPOSE 4443
-EXPOSE 8888
 
 # Exec supervisord
-CMD ["/usr/bin/supervisord"]
+CMD ["java", "-jar", "openvidu-server.jar"]
diff --git a/openvidu-server/docker/openvidu-server/create_image.sh b/openvidu-server/docker/openvidu-server/create_image.sh
index c9a4057d..4473992b 100755
--- a/openvidu-server/docker/openvidu-server/create_image.sh
+++ b/openvidu-server/docker/openvidu-server/create_image.sh
@@ -1,4 +1,4 @@
-cp ../../target/openvidu-server-"$1".jar ./openvidu-server.jar
+cp ../../target/openvidu-server-*.jar ./openvidu-server.jar
 
 docker build -t openvidu/openvidu-server .
 
diff --git a/openvidu-server/docker/openvidu-server/supervisord.conf b/openvidu-server/docker/openvidu-server/supervisord.conf
deleted file mode 100644
index 20df5200..00000000
--- a/openvidu-server/docker/openvidu-server/supervisord.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[supervisord]
-nodaemon=true
-logfile=/var/log/supervisor/supervisord.log;
-pidfile=/var/run/supervisord.pid;
-loglevel=debug
-
-[program:openvidu-server]
-command=/bin/bash -c "java -jar -Dspring.profiles.active=docker /openvidu-server.jar"
-redirect_stderr=true