Added ignored files to gitignore, modified creation of docker images.

pull/88/head
miguel.rodriguez 2018-02-02 17:36:48 +01:00
parent 1182fec876
commit f13bb62a6b
7 changed files with 15 additions and 12 deletions

3
.gitignore vendored
View File

@ -17,3 +17,6 @@ nbactions.xml
.externalToolBuilders .externalToolBuilders
*bin/ *bin/
/.vscode /.vscode
.idea/
*.iml

View File

@ -1,5 +1,5 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
MAINTAINER openvidu@gmail.com MAINTAINER miguel.rodriguez@cocodin.com
# Install Kurento Media Server (KMS) # Install Kurento Media Server (KMS)
RUN echo "deb http://ubuntu.kurento.org xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \ 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/* RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
# Install OpenVidu Server # Install OpenVidu Server
COPY openvidu-server.jar openvidu-server.jar COPY openvidu-server-cbx.jar openvidu-server-cbx.jar
EXPOSE 8888 EXPOSE 8888
EXPOSE 9091 EXPOSE 9091

View File

@ -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

View File

@ -9,5 +9,5 @@ command=/bin/bash /kms.sh
redirect_stderr=true redirect_stderr=true
[program:openvidu-server] [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 redirect_stderr=true

View File

@ -1,5 +1,5 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
MAINTAINER openvidu@gmail.com MAINTAINER miguel.rodriguez@cocodin.com
# Install Java # Install Java
RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/* 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/* RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
# Copy OpenVidu Server # Copy OpenVidu Server
COPY openvidu-server.jar / COPY openvidu-server-cbx.jar /
EXPOSE 8443 EXPOSE 8443
EXPOSE 8888 EXPOSE 8888

View File

@ -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

View File

@ -5,5 +5,5 @@ pidfile=/var/run/supervisord.pid;
loglevel=debug loglevel=debug
[program:openvidu-server] [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 redirect_stderr=true