upgrde javascript version for owt to 5.0 (#736)

dpatel257 · web-flow · commit 5c6fc851c5dd · 2021-05-17T14:12:26.000-07:00
diff --git a/Xeon/centos-7/service/owt-dev/Dockerfile b/Xeon/centos-7/service/owt-dev/Dockerfile
@@ -656,7 +656,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc-m79 && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts &&  \
+    cd owt-client-javascript/scripts && \
+    git reset --hard v5.0 && \
     npm install && grunt 
     
 # Get quic
diff --git a/Xeon/centos-7/service/owt/Dockerfile b/Xeon/centos-7/service/owt/Dockerfile
@@ -657,7 +657,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc-m79 && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts &&  \
+    cd owt-client-javascript/scripts && \
+    git reset --hard v5.0 && \
     npm install && grunt 
     
 # Get quic
diff --git a/Xeon/centos-7/service/owt360/Dockerfile b/Xeon/centos-7/service/owt360/Dockerfile
@@ -468,7 +468,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts && git reset --hard d727af2927731ff16214d73f57964a992258636d && \
+    cd owt-client-javascript/scripts && \
+    git reset --hard d727af2927731ff16214d73f57964a992258636d && \
     npm install && grunt 
     
 # Get quic
diff --git a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile
@@ -699,7 +699,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc-m79 && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts &&  \
+    cd owt-client-javascript/scripts && \
+    git reset --hard v5.0 && \
     npm install && grunt 
     
 # Get quic
diff --git a/Xeon/ubuntu-18.04/service/owt/Dockerfile b/Xeon/ubuntu-18.04/service/owt/Dockerfile
@@ -699,7 +699,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc-m79 && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts &&  \
+    cd owt-client-javascript/scripts && \
+    git reset --hard v5.0 && \
     npm install && grunt 
     
 # Get quic
diff --git a/Xeon/ubuntu-18.04/service/owt360/Dockerfile b/Xeon/ubuntu-18.04/service/owt360/Dockerfile
@@ -506,7 +506,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts && git reset --hard d727af2927731ff16214d73f57964a992258636d && \
+    cd owt-client-javascript/scripts && \
+    git reset --hard d727af2927731ff16214d73f57964a992258636d && \
     npm install && grunt 
     
 # Get quic
diff --git a/XeonE3/centos-7/service/owt-dev/Dockerfile b/XeonE3/centos-7/service/owt-dev/Dockerfile
@@ -709,7 +709,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc-m79 && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts &&  \
+    cd owt-client-javascript/scripts && \
+    git reset --hard v5.0 && \
     npm install && grunt 
     
 # Get quic
diff --git a/XeonE3/centos-7/service/owt/Dockerfile b/XeonE3/centos-7/service/owt/Dockerfile
@@ -710,7 +710,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc-m79 && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts &&  \
+    cd owt-client-javascript/scripts && \
+    git reset --hard v5.0 && \
     npm install && grunt 
     
 # Get quic
diff --git a/XeonE3/centos-7/service/owt360/Dockerfile b/XeonE3/centos-7/service/owt360/Dockerfile
@@ -538,7 +538,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts && git reset --hard d727af2927731ff16214d73f57964a992258636d && \
+    cd owt-client-javascript/scripts && \
+    git reset --hard d727af2927731ff16214d73f57964a992258636d && \
     npm install && grunt 
     
 # Get quic
diff --git a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile
@@ -770,7 +770,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc-m79 && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts &&  \
+    cd owt-client-javascript/scripts && \
+    git reset --hard v5.0 && \
     npm install && grunt 
     
 # Get quic
diff --git a/XeonE3/ubuntu-18.04/service/owt/Dockerfile b/XeonE3/ubuntu-18.04/service/owt/Dockerfile
@@ -770,7 +770,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc-m79 && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts &&  \
+    cd owt-client-javascript/scripts && \
+    git reset --hard v5.0 && \
     npm install && grunt 
     
 # Get quic
diff --git a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile
@@ -577,7 +577,8 @@ RUN mkdir -p /opt/build/owt-server/third_party/webrtc && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd /opt/build && \
     git clone -b master ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts && git reset --hard d727af2927731ff16214d73f57964a992258636d && \
+    cd owt-client-javascript/scripts && \
+    git reset --hard d727af2927731ff16214d73f57964a992258636d && \
     npm install && grunt 
     
 # Get quic
diff --git a/template/components/owt.m4 b/template/components/owt.m4
@@ -37,7 +37,7 @@ DECLARE(`OWT_LICODE_VER',8b4692c88f1fc24dedad66b4f40b1f3d804b50ca)
 DECLARE(`OWT_WEBRTC_BRANCH',59-server)
 DECLARE(`OWT_WEBRTC_VER',)
 DECLARE(`OWT_SDK_BRANCH',master)
-DECLARE(`OWT_SDK_VER',)
+DECLARE(`OWT_SDK_VER',v5.0)
 DECLARE(`OWT_QUIC_VER',v0.1)
 DECLARE(`LIBNICE_PATCH_VER',5.0)
 
@@ -123,7 +123,8 @@ RUN mkdir -p BUILD_HOME/owt-server/third_party/webrtc-m79 && \
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
 RUN cd BUILD_HOME && \
     git clone -b OWT_SDK_BRANCH ${OWT_SDK_REPO} && \
-    cd owt-client-javascript/scripts && ifelse(OWT_360,true,`git reset --hard OWT_SDK_VER &&') \
+    cd owt-client-javascript/scripts && \
+    git reset --hard OWT_SDK_VER && \
     npm install && grunt 
     
 # Get quic
