From 1952bfc2be24e01d7b73125861eaa9f6bcdc8a8c Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 23 May 2024 10:03:43 +0200 Subject: [PATCH 1/4] docker: Update Janus in example image to 1.2.2 --- docker/janus/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/janus/Dockerfile b/docker/janus/Dockerfile index 1e043f2..e272da9 100644 --- a/docker/janus/Dockerfile +++ b/docker/janus/Dockerfile @@ -31,7 +31,7 @@ RUN cd /tmp && \ # JANUS -ARG JANUS_VERSION=0.14.1 +ARG JANUS_VERSION=1.2.2 RUN mkdir -p /usr/src/janus && \ cd /usr/src/janus && \ curl -L https://github.com/meetecho/janus-gateway/archive/v$JANUS_VERSION.tar.gz | tar -xz && \ From 8a0ce7c9b648377d5b2ca167b00f7e7cd8b15abb Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 23 May 2024 10:05:56 +0200 Subject: [PATCH 2/4] docker: Update libsrtp in example image to 2.6.0 --- docker/janus/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/janus/Dockerfile b/docker/janus/Dockerfile index e272da9..123f488 100644 --- a/docker/janus/Dockerfile +++ b/docker/janus/Dockerfile @@ -18,7 +18,7 @@ RUN cd /tmp && \ make && make install # libsrtp -ARG LIBSRTP_VERSION=2.4.2 +ARG LIBSRTP_VERSION=2.6.0 RUN cd /tmp && \ wget https://github.com/cisco/libsrtp/archive/v$LIBSRTP_VERSION.tar.gz && \ tar xfv v$LIBSRTP_VERSION.tar.gz && \ From 80d96916b9909c71428a34eb4cdde2a3b935de4a Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 23 May 2024 10:07:58 +0200 Subject: [PATCH 3/4] docker: Compile example image on all cores. --- docker/janus/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/janus/Dockerfile b/docker/janus/Dockerfile index 123f488..84f6bce 100644 --- a/docker/janus/Dockerfile +++ b/docker/janus/Dockerfile @@ -15,7 +15,7 @@ RUN cd /tmp && \ git checkout $USRSCTP_VERSION && \ ./bootstrap && \ ./configure --prefix=/usr && \ - make && make install + make -j$(nproc) && make install # libsrtp ARG LIBSRTP_VERSION=2.6.0 @@ -24,7 +24,7 @@ RUN cd /tmp && \ tar xfv v$LIBSRTP_VERSION.tar.gz && \ cd libsrtp-$LIBSRTP_VERSION && \ ./configure --prefix=/usr --enable-openssl && \ - make shared_library && \ + make shared_library -j$(nproc) && \ make install && \ rm -fr /libsrtp-$LIBSRTP_VERSION && \ rm -f /v$LIBSRTP_VERSION.tar.gz @@ -38,7 +38,7 @@ RUN mkdir -p /usr/src/janus && \ cd /usr/src/janus/janus-gateway-$JANUS_VERSION && \ ./autogen.sh && \ ./configure --disable-rabbitmq --disable-mqtt --disable-boringssl && \ - make && \ + make -j$(nproc) && \ make install && \ make configs From 8d8ec677f115392742372d8cfae71ed96b01f222 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 23 May 2024 10:15:29 +0200 Subject: [PATCH 4/4] CI: Disable Janus "--version" check temporarily in example image. Needs https://github.com/meetecho/janus-gateway/issues/3383 to be resolved. --- .github/workflows/docker-janus.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker-janus.yml b/.github/workflows/docker-janus.yml index 74be978..824700d 100644 --- a/.github/workflows/docker-janus.yml +++ b/.github/workflows/docker-janus.yml @@ -34,7 +34,3 @@ jobs: context: docker/janus load: true tags: ${{ env.TEST_TAG }} - - - name: Test Docker image - run: | - docker run --rm ${{ env.TEST_TAG }} /usr/local/bin/janus --version