From f13bb62a6b97df9d8769dfff3c80fa33558ac70b Mon Sep 17 00:00:00 2001
From: "miguel.rodriguez" <miguel.rodriguez@cocodin.com>
Date: Fri, 2 Feb 2018 17:36:48 +0100
Subject: [PATCH] Added ignored files to gitignore, modified creation of docker
 images.

---
 .gitignore                                                  | 3 +++
 openvidu-server/docker/openvidu-server-kms/Dockerfile       | 4 ++--
 openvidu-server/docker/openvidu-server-kms/create_image.sh  | 6 +++---
 openvidu-server/docker/openvidu-server-kms/supervisord.conf | 2 +-
 openvidu-server/docker/openvidu-server/Dockerfile           | 4 ++--
 openvidu-server/docker/openvidu-server/create_image.sh      | 6 +++---
 openvidu-server/docker/openvidu-server/supervisord.conf     | 2 +-
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index af572e5e..d3a49dd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ nbactions.xml
 .externalToolBuilders
 *bin/
 /.vscode
+
+.idea/
+*.iml
diff --git a/openvidu-server/docker/openvidu-server-kms/Dockerfile b/openvidu-server/docker/openvidu-server-kms/Dockerfile
index 3a756bcb..97e1ec10 100644
--- a/openvidu-server/docker/openvidu-server-kms/Dockerfile
+++ b/openvidu-server/docker/openvidu-server-kms/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:16.04
-MAINTAINER openvidu@gmail.com
+MAINTAINER miguel.rodriguez@cocodin.com
 
 # Install Kurento Media Server (KMS) 
 RUN	echo "deb http://ubuntu.kurento.org xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \
@@ -20,7 +20,7 @@ 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
+COPY openvidu-server-cbx.jar openvidu-server-cbx.jar
 
 EXPOSE 8888
 EXPOSE 9091
diff --git a/openvidu-server/docker/openvidu-server-kms/create_image.sh b/openvidu-server/docker/openvidu-server-kms/create_image.sh
index 2f5c47f5..4e108a7d 100755
--- a/openvidu-server/docker/openvidu-server-kms/create_image.sh
+++ b/openvidu-server/docker/openvidu-server-kms/create_image.sh
@@ -1,5 +1,5 @@
-cp ../../target/openvidu-server-"$1".jar ./openvidu-server.jar
+cp ../../target/openvidu-server-"$1".jar ./openvidu-server-cbx.jar
 
-docker build -t openvidu/openvidu-server-kms .
+docker build -t councilbox/server-kms .
 
-rm ./openvidu-server.jar
+rm ./openvidu-server-cbx.jar
diff --git a/openvidu-server/docker/openvidu-server-kms/supervisord.conf b/openvidu-server/docker/openvidu-server-kms/supervisord.conf
index 9e6e62b6..d93c0793 100644
--- a/openvidu-server/docker/openvidu-server-kms/supervisord.conf
+++ b/openvidu-server/docker/openvidu-server-kms/supervisord.conf
@@ -9,5 +9,5 @@ command=/bin/bash /kms.sh
 redirect_stderr=true
 
 [program:openvidu-server]
-command=/bin/bash -c "java -jar /openvidu-server.jar"
+command=/bin/bash -c "java -jar /openvidu-server-cbx.jar"
 redirect_stderr=true
\ No newline at end of file
diff --git a/openvidu-server/docker/openvidu-server/Dockerfile b/openvidu-server/docker/openvidu-server/Dockerfile
index 1c07a8f8..70c42067 100644
--- a/openvidu-server/docker/openvidu-server/Dockerfile
+++ b/openvidu-server/docker/openvidu-server/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:16.04
-MAINTAINER openvidu@gmail.com
+MAINTAINER miguel.rodriguez@cocodin.com
 
 # Install Java
 RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/*
@@ -10,7 +10,7 @@ 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
-COPY openvidu-server.jar /
+COPY openvidu-server-cbx.jar /
 
 EXPOSE 8443
 EXPOSE 8888
diff --git a/openvidu-server/docker/openvidu-server/create_image.sh b/openvidu-server/docker/openvidu-server/create_image.sh
index c9a4057d..d6e3e456 100755
--- a/openvidu-server/docker/openvidu-server/create_image.sh
+++ b/openvidu-server/docker/openvidu-server/create_image.sh
@@ -1,5 +1,5 @@
-cp ../../target/openvidu-server-"$1".jar ./openvidu-server.jar
+cp ../../target/openvidu-server-"$1".jar ./openvidu-server-cbx.jar
 
-docker build -t openvidu/openvidu-server .
+docker build -t councilbox/server-java .
 
-rm ./openvidu-server.jar
+rm ./openvidu-server-cbx.jar
\ No newline at end of file
diff --git a/openvidu-server/docker/openvidu-server/supervisord.conf b/openvidu-server/docker/openvidu-server/supervisord.conf
index 37dbf9fe..97012361 100644
--- a/openvidu-server/docker/openvidu-server/supervisord.conf
+++ b/openvidu-server/docker/openvidu-server/supervisord.conf
@@ -5,5 +5,5 @@ pidfile=/var/run/supervisord.pid;
 loglevel=debug
 
 [program:openvidu-server]
-command=/bin/bash -c "java -jar /openvidu-server.jar"
+command=/bin/bash -c "java -jar /openvidu-server-cbx.jar"
 redirect_stderr=true