From a0f199ed2bc915528e66118526c0b4732f364551 Mon Sep 17 00:00:00 2001 From: Daniel Stiner Date: Sun, 6 Dec 2020 10:12:25 -0800 Subject: [PATCH 1/5] Add missing dot to docker build command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1952ceb..cd185f4 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ Configuration is achieved through environment variables. # Dockering - docker build -t janus-ftl + docker build -t janus-ftl . docker run --rm -p 8084:8084/tcp -p 8088:8088/tcp -p 9000-9100:9000-9100/udp -p 20000-20100:20000-20100/udp -e "DOCKER_IP=HOST.IP.ADDRESS.HERE" janus-ftl # Misc Notes From 69cb70b77b335c192db5936668cbc6463ae64024 Mon Sep 17 00:00:00 2001 From: Daniel Stiner Date: Sun, 6 Dec 2020 10:15:15 -0800 Subject: [PATCH 2/5] Disable unused janus plugins and other options Speeds up the build, related to #32 --- Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9c9429c..172e50b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,13 @@ RUN \ cd ${DIR} && \ curl -sLf https://github.com/meetecho/janus-gateway/archive/${JANUSGATEWAY_VERSION}.tar.gz | tar -zx --strip-components=1 && \ sh autogen.sh && \ - ./configure --prefix=/opt/janus && \ + ./configure --prefix=/opt/janus \ + --disable-rabbitmq \ + --disable-mqtt \ + --disable-unix-sockets \ + --disable-websockets \ + --disable-all-handlers \ + --disable-all-plugins && \ make && \ make configs && \ make install && \ From b0615958963e798a4b090932d8153fb17de3555a Mon Sep 17 00:00:00 2001 From: Daniel Stiner Date: Sun, 6 Dec 2020 17:42:57 -0800 Subject: [PATCH 3/5] Dockerignore file --- .dockerignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..7731f4d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +core +build/ +builddir/ \ No newline at end of file From 7930a9647a24fd0a570ce1a0f4758400f8d0d280 Mon Sep 17 00:00:00 2001 From: Daniel Stiner Date: Sun, 6 Dec 2020 17:44:22 -0800 Subject: [PATCH 4/5] Formatting --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 172e50b..4b25081 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,12 +37,12 @@ RUN \ curl -sLf https://github.com/meetecho/janus-gateway/archive/${JANUSGATEWAY_VERSION}.tar.gz | tar -zx --strip-components=1 && \ sh autogen.sh && \ ./configure --prefix=/opt/janus \ - --disable-rabbitmq \ - --disable-mqtt \ - --disable-unix-sockets \ - --disable-websockets \ - --disable-all-handlers \ - --disable-all-plugins && \ + --disable-rabbitmq \ + --disable-mqtt \ + --disable-unix-sockets \ + --disable-websockets \ + --disable-all-handlers \ + --disable-all-plugins && \ make && \ make configs && \ make install && \ From c9be26023d742dc2c1714d90c5d398a39c046520 Mon Sep 17 00:00:00 2001 From: Daniel Stiner Date: Sun, 27 Dec 2020 20:40:44 -0800 Subject: [PATCH 5/5] Add git dependency to dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4b25081..3e2bcb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:20.04 -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install curl libmicrohttpd-dev libjansson-dev libssl-dev libsofia-sip-ua-dev libglib2.0-dev libopus-dev libogg-dev libcurl4-openssl-dev liblua5.3-dev libconfig-dev pkg-config gengetopt libtool automake python3 python3-pip python3-setuptools python3-dev python3-wheel ninja-build libavcodec-dev +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install curl git libmicrohttpd-dev libjansson-dev libssl-dev libsofia-sip-ua-dev libglib2.0-dev libopus-dev libogg-dev libcurl4-openssl-dev liblua5.3-dev libconfig-dev pkg-config gengetopt libtool automake python3 python3-pip python3-setuptools python3-dev python3-wheel ninja-build libavcodec-dev RUN pip3 install meson