From 1476f5c155b360adcb2665ca9ee993e8c3486fd9 Mon Sep 17 00:00:00 2001
From: DCsunset <dcsunset@protonmail.com>
Date: Sun, 2 Feb 2020 19:20:51 -0800
Subject: [PATCH] feat: use tigervnc binaries to support 16.04

---
 Dockerfile |  9 ++++++---
 start.sh   | 10 ++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 77349d3..4b34c45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ LABEL MAINTAINER="DCsunset"
 
 ENV noVNC_version=1.1.0
 ENV websockify_version=0.9.0
+ENV tigervnc_version=1.10.1
 
 # Local debug
 #COPY ./sources.list /etc/apt/
@@ -14,13 +15,15 @@ ENV websockify_version=0.9.0
 # Install apps
 RUN apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -yq xfce4 xfce4-goodies \
-	tigervnc-standalone-server \
 	chromium-browser vim wget \
 	python3-numpy python3-setuptools \
 	&& rm -rf /var/lib/apt/lists/*
 
-# Install noVNC
-RUN wget https://github.com/novnc/websockify/archive/v${websockify_version}.tar.gz -O /websockify.tar.gz \
+# Install TigerVNC and noVNC
+RUN wget "https://bintray.com/tigervnc/stable/download_file?file_path=tigervnc-${tigervnc_version}.x86_64.tar.gz" -O /tigervnc.tar.gz \
+	&& tar -xvf /tigervnc.tar.gz -C / \
+	&& rm /tigervnc.tar.gz \
+	&& wget https://github.com/novnc/websockify/archive/v${websockify_version}.tar.gz -O /websockify.tar.gz \
 	&& tar -xvf /websockify.tar.gz -C / \
 	&& cd /websockify-${websockify_version} \
 	&& python3 setup.py install \
diff --git a/start.sh b/start.sh
index 5dad8a3..44ee381 100755
--- a/start.sh
+++ b/start.sh
@@ -4,13 +4,15 @@ umask 0077                # use safe default permissions
 mkdir -p "$HOME/.vnc"     # create config directory
 chmod go-rwx "$HOME/.vnc" # enforce safe permissions
 
+tigervnc_path="/tigervnc-${tigervnc_version}.x86_64/usr/bin"
+
 # Start TigerVNC
 if [ ! -z $VNC_PASSWD ]; then
-	vncpasswd -f <<< "$VNC_PASSWD" > "$HOME/.vnc/passwd"
-	vncserver -localhost no :0
+	${tigervnc_path}/vncpasswd -f <<< "$VNC_PASSWD" > "$HOME/.vnc/passwd"
+	${tigervnc_path}/vncserver -localhost no :0
 else
-	vncpasswd -f <<< "" > "$HOME/.vnc/passwd"
-	vncserver --I-KNOW-THIS-IS-INSECURE -SecurityTypes None -localhost no :0
+	${tigervnc_path}/vncpasswd -f <<< "" > "$HOME/.vnc/passwd"
+	${tigervnc_path}/vncserver --I-KNOW-THIS-IS-INSECURE -SecurityTypes None -localhost no :0
 fi
 
 # Start noVNC