From 05b83e5098aed8a59b37bd0e852c33a119d7c8a6 Mon Sep 17 00:00:00 2001
From: Budi Utomo <budtmo.os@gmail.com>
Date: Fri, 10 Feb 2023 23:14:54 +0100
Subject: [PATCH] Using release-tag instead of commit-id on novnc and
 websockify and updated them (#1787)

Using release tag instead of commit-id on novnc and websockify and updated both to the latest version

[deploy]
---
 NodeBase/Dockerfile     | 16 +++++++---------
 NodeBase/start-novnc.sh |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile
index 1298ee3bf..d37c66234 100644
--- a/NodeBase/Dockerfile
+++ b/NodeBase/Dockerfile
@@ -92,22 +92,20 @@ RUN apt-get -qqy update \
 ########################################
 # noVNC exposes VNC through a web page #
 ########################################
-# Download https://github.com/novnc/noVNC dated 2021-03-30 commit 84f102d6a9ffaf3972693d59bad5c6fddb6d7fb0
-# Download https://github.com/novnc/websockify dated 2021-03-22 commit c5d365dd1dbfee89881f1c1c02a2ac64838d645f
-ENV NOVNC_SHA="84f102d6a9ffaf3972693d59bad5c6fddb6d7fb0" \
-    WEBSOCKIFY_SHA="c5d365dd1dbfee89881f1c1c02a2ac64838d645f"
+ENV NOVNC_VERSION="1.4.0" \
+    WEBSOCKIFY_VERSION="0.11.0"
 RUN  wget -nv -O noVNC.zip \
-       "https://github.com/novnc/noVNC/archive/${NOVNC_SHA}.zip" \
+       "https://github.com/novnc/noVNC/archive/refs/tags/v${NOVNC_VERSION}.zip" \
   && unzip -x noVNC.zip \
-  && mv noVNC-${NOVNC_SHA} /opt/bin/noVNC \
+  && mv noVNC-${NOVNC_VERSION} /opt/bin/noVNC \
   && cp /opt/bin/noVNC/vnc.html /opt/bin/noVNC/index.html \
   && rm noVNC.zip \
   && wget -nv -O websockify.zip \
-      "https://github.com/novnc/websockify/archive/${WEBSOCKIFY_SHA}.zip" \
+      "https://github.com/novnc/websockify/archive/refs/tags/v${WEBSOCKIFY_VERSION}.zip" \
   && unzip -x websockify.zip \
   && rm websockify.zip \
-  && rm -rf websockify-${WEBSOCKIFY_SHA}/tests \
-  && mv websockify-${WEBSOCKIFY_SHA} /opt/bin/noVNC/utils/websockify
+  && rm -rf websockify-${WEBSOCKIFY_VERSION}/tests \
+  && mv websockify-${WEBSOCKIFY_VERSION} /opt/bin/noVNC/utils/websockify
 
 #=========================================================================================================================================
 # Run this command for executable file permissions for /dev/shm when this is a "child" container running in Docker Desktop and WSL2 distro
diff --git a/NodeBase/start-novnc.sh b/NodeBase/start-novnc.sh
index 9b7984314..7c8d41199 100755
--- a/NodeBase/start-novnc.sh
+++ b/NodeBase/start-novnc.sh
@@ -4,7 +4,7 @@
 
 if [ "${START_XVFB:-$SE_START_XVFB}" = true ] ; then
   if [ "${START_NO_VNC:-$SE_START_NO_VNC}" = true ] ; then
-    /opt/bin/noVNC/utils/launch.sh --listen ${NO_VNC_PORT:-$SE_NO_VNC_PORT} --vnc localhost:${VNC_PORT:-$SE_VNC_PORT}
+    /opt/bin/noVNC/utils/novnc_proxy --listen ${NO_VNC_PORT:-$SE_NO_VNC_PORT} --vnc localhost:${VNC_PORT:-$SE_VNC_PORT}
   else
     echo "noVNC won't start because SE_START_NO_VNC is false."
   fi