Merge pull request #19 from mrgreywater/tigervnc

replace x11vnc and xvfb with tigervnc  ( @mrgreywater )
- solves #18

Author: MRColorR

README.md

@@ -57,12 +57,10 @@ You can customize the settings of the Docker container by passing environment va
 - Enabling/disabling auto-start for the browser: `AUTO_START_BROWSER=true` or `AUTO_START_BROWSER=false`
 - Enabling/disabling auto-start for xterm: `AUTO_START_XTERM=true` or `AUTO_START_XTERM=false`
 - Enabling/disabling auto-start for window manager (fluxbox): `AUTO_START_WM=true` or `AUTO_START_WM=false`
-- Enabling/disabling auto-start for x11vnc: `AUTO_START_X11VNC=true` or `AUTO_START_X11VNC=false`
-- Enabling/disabling auto-start for xvfb: `AUTO_START_XVFB=true` or `AUTO_START_XVFB=false`
+- Enabling/disabling auto-start for vnc (tigervnc): `AUTO_START_VNC=true` or `AUTO_START_VNC=false`
 - Enabling/disabling auto-start for noVNC (websockify): `AUTO_START_NOVNC=true` or `AUTO_START_NOVNC=false`
 - Adding command options for browser: `BROWSER_OPTIONS="--start-fullscreen --kiosk --incognito --noerrdialogs --no-first-run --disk-cache-dir=/dev/null"`
-- Adding command options for x11vnc: `X11VNC_OPTIONS="-nocursor"`
-- Adding command options for xvfb: `XVFB_OPTIONS="-nocursor"`
+- Adding command options for vnc (tigervnc): `VNC_OPTIONS="-AlwaysShared"`
 - Adding command options for window manager (fluxbox): `WM_OPTIONS="-rc /app/fluxbox.conf"`
 - Adding command options for noVNC (websockify): `NOVNC_OPTIONS="--heartbeat=10"`
 - Adding command options for xterm: `XTERM_OPTIONS="-leftbar"`
@@ -83,14 +81,12 @@ You can customize the settings of the Docker container by passing environment va
 | AUTO_START_BROWSER     | true                              | Automatically start the browser |
 | AUTO_START_XTERM       | true                              | Automatically start xterm |
 | AUTO_START_WM          | true                              | Automatically start window manager (fluxbox) |
-| AUTO_START_X11VNC      | true                              | Automatically start x11vnc |
-| AUTO_START_XVFB        | true                              | Automatically start xvfb |
+| AUTO_START_VNC         | true                              | Automatically start vnc (tigervnc) |
 | AUTO_START_NOVNC       | true                              | Automatically start noVNC (websockify) |
 | CUSTOM_ENTRYPOINTS_DIR | /app/custom_entrypoints_scripts   | Directory for custom entry point scripts |
 | DEBIAN_FRONTEND        | noninteractive                    | Frontend setting for Debian-based installations |
 | BROWSER_OPTIONS        |                                   | Additional command options to provide to browser start |
-| X11VNC_OPTIONS         |                                   | Additional command options to provide to x11vnc start |
-| XVFB_OPTIONS           |                                   | Additional command options to provide to xvfb start |
+| VNC_OPTIONS            |                                   | Additional command options to provide to vnc (tigervnc) start |
 | WM_OPTIONS             |                                   | Additional command options to provide to window manager (fluxbox) start |
 | NOVNC_OPTIONS          |                                   | Additional command options to provide to noVNC (websockify) start |
 | XTERM_OPTIONS          |                                   | Additional command options to provide to xterm start |

alpine.dockerfile

@@ -16,12 +16,10 @@ ARG DEF_CUSTOM_ENTRYPOINTS_DIR=/app/custom_entrypoints_scripts
 ARG DEF_AUTO_START_BROWSER=true
 ARG DEF_AUTO_START_XTERM=true
 ARG DEF_AUTO_START_WM=true
-ARG DEF_AUTO_START_X11VNC=true
-ARG DEF_AUTO_START_XVFB=true
+ARG DEF_AUTO_START_VNC=true
 ARG DEF_AUTO_START_NOVNC=true
 ARG DEF_BROWSER_OPTIONS=
-ARG DEF_X11VNC_OPTIONS=
-ARG DEF_XVFB_OPTIONS=
+ARG DEF_VNC_OPTIONS=
 ARG DEF_WM_OPTIONS=
 ARG DEF_NOVNC_OPTIONS=
 ARG DEF_XTERM_OPTIONS=
@@ -42,12 +40,10 @@ ENV DISPLAY=:${DEF_VNC_DISPLAY}.${DEF_VNC_SCREEN} \
     AUTO_START_BROWSER=${DEF_AUTO_START_BROWSER} \
     AUTO_START_XTERM=${DEF_AUTO_START_XTERM} \
     AUTO_START_WM=${DEF_AUTO_START_WM} \
-    AUTO_START_X11VNC=${DEF_AUTO_START_X11VNC} \
-    AUTO_START_XVFB=${DEF_AUTO_START_XVFB} \
+    AUTO_START_VNC=${DEF_AUTO_START_VNC} \
     AUTO_START_NOVNC=${DEF_AUTO_START_NOVNC} \
     BROWSER_OPTIONS=${DEF_BROWSER_OPTIONS} \
-    X11VNC_OPTIONS=${DEF_X11VNC_OPTIONS} \
-    XVFB_OPTIONS=${DEF_XVFB_OPTIONS} \
+    VNC_OPTIONS=${DEF_VNC_OPTIONS} \
     WM_OPTIONS=${DEF_WM_OPTIONS} \
     NOVNC_OPTIONS=${DEF_NOVNC_OPTIONS} \
     XTERM_OPTIONS=${DEF_XTERM_OPTIONS}
@@ -61,8 +57,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/reposit
     tini \
     supervisor \
     bash \
-    xvfb \
-    x11vnc \
+    tigervnc \
     novnc \
     websockify \
     fluxbox \

base_entrypoint.sh

@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
-# Add password to x11vnc options
+# Add password to vnc options
 if [ -n "${VNC_PASSWORD}" ]; then
-    X11VNC_OPTIONS="${X11VNC_OPTIONS} -passwd '${VNC_PASSWORD}'"
+    mkdir -p ~/.vnc
+    echo "${VNC_PASSWORD}" | vncpasswd -f > ~/.vnc/passwd
+    export VNC_OPTIONS="${VNC_OPTIONS} -SecurityTypes VncAuth -PasswordFile /root/.vnc/passwd"
+else
+    export VNC_OPTIONS="${VNC_OPTIONS} -SecurityTypes None"
 fi
 
 # Print current VNC info

conf.d/tigervnc.conf

@@ -0,0 +1,6 @@
+[program:Xvnc]
+command=/usr/bin/Xvnc %(ENV_DISPLAY)s -geometry %(ENV_VNC_RESOLUTION)s -rfbport %(ENV_VNC_PORT)s %(ENV_VNC_OPTIONS)s
+autostart=%(ENV_AUTO_START_VNC)s
+autorestart=true
+# stdout_logfile=/var/log/Xvnc.log
+# stderr_logfile=/var/log/Xvnc.err.log

conf.d/x11vnc.conf

@@ -17,12 +17,10 @@ ARG DEF_AUTO_START_BROWSER=true
 ARG DEF_AUTO_START_XTERM=true
 ARG DEF_DEBIAN_FRONTEND=noninteractive
 ARG DEF_AUTO_START_WM=true
-ARG DEF_AUTO_START_X11VNC=true
-ARG DEF_AUTO_START_XVFB=true
+ARG DEF_AUTO_START_VNC=true
 ARG DEF_AUTO_START_NOVNC=true
 ARG DEF_BROWSER_OPTIONS=
-ARG DEF_X11VNC_OPTIONS=
-ARG DEF_XVFB_OPTIONS=
+ARG DEF_VNC_OPTIONS=
 ARG DEF_WM_OPTIONS=
 ARG DEF_NOVNC_OPTIONS=
 ARG DEF_XTERM_OPTIONS=
@@ -45,12 +43,10 @@ ENV DISPLAY=:${DEF_VNC_DISPLAY}.${DEF_VNC_SCREEN} \
     DEBIAN_FRONTEND=${DEF_DEBIAN_FRONTEND} \
     AUTO_START_XTERM=${DEF_AUTO_START_XTERM} \
     AUTO_START_WM=${DEF_AUTO_START_WM} \
-    AUTO_START_X11VNC=${DEF_AUTO_START_X11VNC} \
-    AUTO_START_XVFB=${DEF_AUTO_START_XVFB} \
+    AUTO_START_VNC=${DEF_AUTO_START_VNC} \
     AUTO_START_NOVNC=${DEF_AUTO_START_NOVNC} \
     BROWSER_OPTIONS=${DEF_BROWSER_OPTIONS} \
-    X11VNC_OPTIONS=${DEF_X11VNC_OPTIONS} \
-    XVFB_OPTIONS=${DEF_XVFB_OPTIONS} \
+    VNC_OPTIONS=${DEF_VNC_OPTIONS} \
     WM_OPTIONS=${DEF_WM_OPTIONS} \
     NOVNC_OPTIONS=${DEF_NOVNC_OPTIONS} \
     XTERM_OPTIONS=${DEF_XTERM_OPTIONS}
@@ -63,8 +59,8 @@ RUN set -e; \
     tini \
     supervisor \
     bash \
-    xvfb \
-    x11vnc \
+    tigervnc-standalone-server \
+    tigervnc-tools \
     novnc \
     websockify \
     fluxbox \