From 5086883ffe85826726822c7e92cdae07273fd37f Mon Sep 17 00:00:00 2001 From: Eren Erdemli Date: Tue, 8 Feb 2022 22:44:07 +0300 Subject: [PATCH 1/6] Bump up Node Version and fix owt-deps-webrtc folder name for Docker Build --- docker/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9e5de5d62..eeba3b771 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -104,7 +104,7 @@ RUN cd /home/FFmpeg && \ # Install node -ARG NODE_VER=v10.21.0 +ARG NODE_VER=v14.19.0 ARG NODE_REPO=https://nodejs.org/dist/${NODE_VER}/node-${NODE_VER}-linux-x64.tar.xz RUN wget ${NODE_REPO} && \ @@ -192,9 +192,9 @@ RUN cd ${SERVER_PATH}/third_party && mkdir webrtc && cd webrtc &&\ ./src/tools-woogeen/install.sh && \ ./src/tools-woogeen/build.sh -# Install webrtc79 for owt -RUN mkdir ${SERVER_PATH}/third_party/webrtc-m79 && \ - cd ${SERVER_PATH}/third_party/webrtc-m79 && \ +# Install webrtc88 for owt +RUN mkdir ${SERVER_PATH}/third_party/webrtc-m88 && \ + cd ${SERVER_PATH}/third_party/webrtc-m88 && \ /bin/bash ${SERVER_PATH}/scripts/installWebrtc.sh # Get js client sdk for owt @@ -214,7 +214,7 @@ WORKDIR /home # Prerequisites # Install node -ARG NODE_VER=v10.21.0 +ARG NODE_VER=v14.19.0 ARG NODE_REPO=https://nodejs.org/dist/${NODE_VER}/node-${NODE_VER}-linux-x64.tar.xz RUN apt-get update && apt-get install -y -q --no-install-recommends ca-certificates wget xz-utils rabbitmq-server mongodb libboost-system-dev libboost-thread-dev liblog4cxx-dev libglib2.0-0 libfreetype6-dev curl sudo From 974f6229f864f72cfbce4e6afd783201c9e53ac9 Mon Sep 17 00:00:00 2001 From: Eren Erdemli Date: Thu, 19 Oct 2023 17:24:14 +0100 Subject: [PATCH 2/6] fix 404 zlib library not found error by Bumping it to version 1.3 --- scripts/installCommonDeps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/installCommonDeps.sh b/scripts/installCommonDeps.sh index c1b76abb0..aa5da219d 100644 --- a/scripts/installCommonDeps.sh +++ b/scripts/installCommonDeps.sh @@ -95,7 +95,7 @@ install_ffmpeg(){ } install_zlib() { - local VERSION="1.2.13" + local VERSION="1.3" local LIST_LIBS=`ls ${PREFIX_DIR}/lib/libz* 2>/dev/null` [ "$INCR_INSTALL" = true ] && [[ ! -z $LIST_LIBS ]] && \ From 262f35a84ecfc6172c909d8ded7df80c51ae4e10 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 20 Oct 2023 17:00:39 +0100 Subject: [PATCH 3/6] Add quic-lib, webrtc-XX and binding.gyp to ignore list --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index f9f2895a9..421136675 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ build/ dist/ +third_party/quic-lib third_party/node-v* third_party/usrsctp/ third_party/licode/ @@ -7,6 +8,8 @@ third_party/openh264 third_party/nICEr third_party/re third_party/webrtc +third_party/webrtc-* +source/**/binding.gyp third_party/SVT-HEVC node_modules/ *.o From 3e4dec015169c5b124ca56b64847705ce747ad06 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 20 Oct 2023 17:47:24 +0100 Subject: [PATCH 4/6] prevent bash early exit -e for node-gyp check as installer exits if package is not installed --- scripts/installCommonDeps.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/installCommonDeps.sh b/scripts/installCommonDeps.sh index aa5da219d..6a2834c27 100644 --- a/scripts/installCommonDeps.sh +++ b/scripts/installCommonDeps.sh @@ -519,9 +519,10 @@ install_node() { } install_node_tools() { + local installed=0 if [ "$CHECK_INSTALL" = true ]; then - npm list -g node-gyp > /dev/null 2>&1 - if [ $? -eq 0 ]; then + npm list -g node-gyp > /dev/null 2>&1 || installed=1 + if [ $installed -eq 0 ]; then echo "node_tools - Yes" else echo "node_tools - No" @@ -529,8 +530,8 @@ install_node_tools() { return 0 fi if [ "${INCR_INSTALL}" == "true" ]; then - npm list -g node-gyp > /dev/null 2>&1 - [ $? -eq 0 ] && echo "node tools already installed." && return 0 + npm list -g node-gyp > /dev/null 2>&1 || installed=1 + [ $installed -eq 0 ] && echo "node tools already installed." && return 0 fi check_proxy From 34a0b9f024f4288bb7dfaa365f6cd65bfb091482 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 20 Oct 2023 17:53:05 +0100 Subject: [PATCH 5/6] Check for required version of node-gyp as npm list -g might already have it as dependency without being in the path --- scripts/installCommonDeps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/installCommonDeps.sh b/scripts/installCommonDeps.sh index 6a2834c27..3ce8845d5 100644 --- a/scripts/installCommonDeps.sh +++ b/scripts/installCommonDeps.sh @@ -521,7 +521,7 @@ install_node() { install_node_tools() { local installed=0 if [ "$CHECK_INSTALL" = true ]; then - npm list -g node-gyp > /dev/null 2>&1 || installed=1 + npm list -g node-gyp@6.1.0 > /dev/null 2>&1 || installed=1 if [ $installed -eq 0 ]; then echo "node_tools - Yes" else @@ -530,7 +530,7 @@ install_node_tools() { return 0 fi if [ "${INCR_INSTALL}" == "true" ]; then - npm list -g node-gyp > /dev/null 2>&1 || installed=1 + npm list -g node-gyp@6.1.0 > /dev/null 2>&1 || installed=1 [ $installed -eq 0 ] && echo "node tools already installed." && return 0 fi From d3109185ee399c882563d2a02bc61f4cf7ec4611 Mon Sep 17 00:00:00 2001 From: Eren Date: Sun, 22 Oct 2023 17:59:13 +0300 Subject: [PATCH 6/6] remove errorness .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 421136675..fa3e3c8de 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ third_party/nICEr third_party/re third_party/webrtc third_party/webrtc-* -source/**/binding.gyp third_party/SVT-HEVC node_modules/ *.o