From 862fb286b81fe6e6a0a728936a5295d089cb7f59 Mon Sep 17 00:00:00 2001 From: kakashi Date: Thu, 30 Jul 2020 11:10:03 +0200 Subject: [PATCH 1/3] base image moved to debian:buster, container working without docs --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b10a18d..6fc5cef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:buster LABEL maintainer="Linagora Folks " LABEL description="Provides an image with Janus Gateway" @@ -15,11 +15,13 @@ RUN apt-get install -y \ libsofia-sip-ua-dev \ libglib2.0-dev \ libopus-dev \ + libconfig-dev \ libogg-dev \ libini-config-dev \ libcollection-dev \ pkg-config \ gengetopt \ + libcurl4-openssl-dev \ libtool \ autotools-dev \ automake @@ -35,7 +37,6 @@ RUN apt-get install -y \ RUN cd ~ \ && git clone https://github.com/cisco/libsrtp.git \ && cd libsrtp \ - && git checkout v2.0.0 \ && ./configure --prefix=/usr --enable-openssl \ && make shared_library \ && sudo make install @@ -62,12 +63,12 @@ RUN cd ~ \ && git clone https://github.com/meetecho/janus-gateway.git \ && cd janus-gateway \ && sh autogen.sh \ - && ./configure --prefix=/opt/janus --disable-rabbitmq --disable-mqtt --enable-docs \ + && ./configure --prefix=/opt/janus --disable-rabbitmq --disable-mqtt \ && make CFLAGS='-std=c99' \ && make install \ && make configs -RUN cp -rp ~/janus-gateway/certs /opt/janus/share/janus +#RUN cp -rp ~/janus-gateway/certs /opt/janus/share/janus COPY conf/*.cfg /opt/janus/etc/janus/ @@ -77,4 +78,4 @@ COPY nginx/nginx.conf /etc/nginx/nginx.conf EXPOSE 80 7088 8088 8188 8089 EXPOSE 10000-10200/udp -CMD service nginx restart && /opt/janus/bin/janus --nat-1-1=${DOCKER_IP} \ No newline at end of file +CMD service nginx restart && /opt/janus/bin/janus --nat-1-1=${DOCKER_IP} From e21a0939ecb8d07204026875ae32fbe783026b19 Mon Sep 17 00:00:00 2001 From: kakashi Date: Thu, 30 Jul 2020 11:31:44 +0200 Subject: [PATCH 2/3] moved base image to ubuntu:focal, added doxygen --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6fc5cef..c9996de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,10 @@ -FROM debian:buster +FROM ubuntu:focal LABEL maintainer="Linagora Folks " LABEL description="Provides an image with Janus Gateway" +ENV DEBIAN_FRONTEND "noninteractive" +RUN ln -fs /usr/share/zoneinfo/Europe/Rome /etc/localtime RUN apt-get update -y \ && apt-get upgrade -y @@ -63,7 +65,7 @@ RUN cd ~ \ && git clone https://github.com/meetecho/janus-gateway.git \ && cd janus-gateway \ && sh autogen.sh \ - && ./configure --prefix=/opt/janus --disable-rabbitmq --disable-mqtt \ + && ./configure --prefix=/opt/janus --disable-rabbitmq --disable-mqtt --enable-docs \ && make CFLAGS='-std=c99' \ && make install \ && make configs From 8d33f24043aacac312b911b3e92a02d595b873b1 Mon Sep 17 00:00:00 2001 From: kakashi Date: Thu, 30 Jul 2020 11:35:22 +0200 Subject: [PATCH 3/3] localtime moved to America/New_York --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c9996de..d877f29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="Linagora Folks " LABEL description="Provides an image with Janus Gateway" ENV DEBIAN_FRONTEND "noninteractive" -RUN ln -fs /usr/share/zoneinfo/Europe/Rome /etc/localtime +RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime RUN apt-get update -y \ && apt-get upgrade -y