From 906d66f40337e727b9eda6e254e64336d0ab8b78 Mon Sep 17 00:00:00 2001
From: Myve <forge@myvelabs.com>
Date: Tue, 23 Jul 2024 01:21:29 +0000
Subject: [PATCH] Update bare novnc

---
 novnc/.env                | 21 +++++++++++----------
 novnc/Dockerfile          |  6 ++++--
 novnc/build               |  9 +++++----
 novnc/docker-compose.yaml | 21 ++++++++++++++-------
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/novnc/.env b/novnc/.env
index 8251580..4618006 100644
--- a/novnc/.env
+++ b/novnc/.env
@@ -3,22 +3,23 @@
 MYVNC_NOVNC_PORT=
 
 # Optional title (shows up in browser top bar)
-MYVNC_CUSTOM_TITLE=
+MYVNC_NOVNC_CUSTOM_TITLE=
 
 # Variable is required if using a subdirectory in proxy
-MYVNC_PROXYPATH=
+MYVNC_NOVNC_PROXYPATH=
 
 # Optional: Port of listening VNC server (defaults to 5900)
-# An SSH tunnel will be attempted between ${MYVNC_VNCSERVER_HOST}:${MYVNC_VNCSERVER_PORT} to MYVNC_VNCSSH_PORT
-MYVNC_VNCLISTEN_HOST=
-MYVNC_VNCLISTEN_PORT=
+# An SSH tunnel will be attempted between
+# ${MYVNC_NOVNC_VNCLISTEN_HOST}:${MYVNC_NOVNC_VNCLISTEN_PORT} to MYVNC_NOVNC_VNCSSH_PORT
+MYVNC_NOVNC_VNCLISTEN_HOST=
+MYVNC_NOVNC_VNCLISTEN_PORT=
 
 # Required: Hostname and port of VNC server to listen to
-MYVNC_VNCSSH_HOST=
-MYVNC_VNCSSH_PORT=
+MYVNC_NOVNC_VNCSSH_HOST=
+MYVNC_NOVNC_VNCSSH_PORT=
 
-# MYVNC_SSHDIR should contain the SSH private/public keys and config 
-MYVNC_SSHDIR=
+# MYVNC_NOVNC_SSHDIR should contain the SSH private/public keys and config
+MYVNC_NOVNC_SSHDIR=
 
 # Change to true to enable multiple simultaneous connections
-MYVNC_VNCSHARING=false
\ No newline at end of file
+MYVNC_NOVNC_VNCSHARING=
diff --git a/novnc/Dockerfile b/novnc/Dockerfile
index 91a1b2e..ad53207 100644
--- a/novnc/Dockerfile
+++ b/novnc/Dockerfile
@@ -6,7 +6,9 @@ USER root
 ARG addpkg
 
 # Install ssh client
-RUN apk add --no-cache \
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache \
     openssh-client \
     && <<-'01-init' cat >>/app/init.d/01-init.sh
 
@@ -35,4 +37,4 @@ ssh ${MYVNC_VNCSSH_HOST} -L ${MYVNC_VNCLISTEN_HOST:-5900}:localhost:${MYVNC_VNCS
 01-init
 
 # Default environment
-USER ${debug:-user}
\ No newline at end of file
+USER ${debug:-user}
diff --git a/novnc/build b/novnc/build
index af65284..7efdc50 100755
--- a/novnc/build
+++ b/novnc/build
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 # Docker build
 # Optional buildtag
-DOCKER_BUILDKIT=1 \
-docker build . \
-    --build-arg debug=${debug:-""} \
-    --tag ${buildtag:-myvnc/novnc}
\ No newline at end of file
+# DOCKER_BUILDKIT=1 \
+# docker build . \
+#     --build-arg debug=${debug:-""} \
+#     --tag ${buildtag:-myvnc/novnc}
+docker compose up --build --detach
diff --git a/novnc/docker-compose.yaml b/novnc/docker-compose.yaml
index 479c31f..26ce2c5 100644
--- a/novnc/docker-compose.yaml
+++ b/novnc/docker-compose.yaml
@@ -3,19 +3,26 @@ services:
     image: myvnc/novnc
     container_name: novnc
     restart: unless-stopped
+    build:
+      context: .
     ports:
       - ${MYVNC_NOVNC_PORT}:6900
     environment:
-      MYVNC_CUSTOM_TITLE: ${MYVNC_CUSTOM_TITLE:-noVNC}
-      MYVNC_PROXYPATH: ${MYVNC_PROXYPATH:-/}
-      MYVNC_VNCSERVER_PORT: ${MYVNC_VNCSERVER_PORT:-5900}
-      MYVNC_VNCSSH_HOST: ${MYVNC_VNCSSH_HOST}
-      MYVNC_VNCSSH_PORT: ${MYVNC_VNCSSH_PORT}
+      MYVNC_CUSTOM_TITLE: ${MYVNC_NOVNC_CUSTOM_TITLE:-noVNC}
+      MYVNC_PROXYPATH: ${MYVNC_NOVNC_PROXYPATH:-/}
+
+      MYVNC_VNCSSH_HOST: ${MYVNC_NOVNC_VNCSSH_HOST}
+      MYVNC_VNCSSH_PORT: ${MYVNC_NOVNC_VNCSSH_PORT}
+
+      MYVNC_VNCLISTEN_HOST: ${MYVNC_NOVNC_VNCLISTEN_HOST:-localhost}
+      MYVNC_VNCLISTEN_PORT: ${MYVNC_NOVNC_VNCLISTEN_PORT:-5900}
+
+      MYVNC_VNCSHARING: ${MYVNC_NOVNC_VNCSHARING:-false}
     volumes:
-      - ${MYVNC_SSHDIR}:/home/user/.ssh
+      - ${MYVNC_NOVNC_SSHDIR}:/home/user/.ssh
     networks:
       - novnc
 
 networks:
   novnc:
-    external: false
\ No newline at end of file
+    external: false