xfce

Dockerfile

@@ -1,19 +1,11 @@
-FROM debian:buster
+FROM ubuntu:bionic
 
 # Install git, supervisor, VNC, & X11 packages
 RUN set -ex; \
+    export DEBIAN_FRONTEND=noninteractive; \
     apt-get update; \
     apt-get install -y \
-      bash \
-      fluxbox \
-      git \
-      net-tools \
-      novnc \
-      supervisor \
-      x11vnc \
-      xterm \
-      xvfb
-
+      xfce4 vnc4server xfce4-terminal supervisor novnc
 # Setup demo environment variables
 ENV HOME=/root \
     DEBIAN_FRONTEND=noninteractive \
@@ -22,9 +14,19 @@ ENV HOME=/root \
     LC_ALL=C.UTF-8 \
     DISPLAY=:0.0 \
     DISPLAY_WIDTH=1024 \
-    DISPLAY_HEIGHT=768 \
-    RUN_XTERM=yes \
-    RUN_FLUXBOX=yes
+    DISPLAY_HEIGHT=768
+
+RUN apt-get install -y \
+    language-pack-zh-hans \
+    fonts-droid-fallback \
+    ttf-wqy-zenhei \
+    ttf-wqy-microhei \
+    fonts-arphic-ukai \
+    fonts-arphic-uming
+
 COPY . /app
+COPY xstartup /root/.vnc/xstartup
+COPY passwd /root/.vnc/passwd
 CMD ["/app/entrypoint.sh"]
 EXPOSE 8080
+EXPOSE 5900

conf.d/fluxbox.conf

@@ -1,3 +0,0 @@
-[program:fluxbox]
-command=fluxbox
-autorestart=true

conf.d/vnc4server.conf

@@ -0,0 +1,3 @@
+[program:vnc4server]
+command=vnc4server :0
+autorestart=true

conf.d/x11vnc.conf

@@ -1,3 +0,0 @@
-[program:x11vnc]
-command=x11vnc -forever -shared
-autorestart=true

conf.d/xterm.conf

@@ -1,3 +0,0 @@
-[program:xterm]
-command=xterm
-autorestart=true

conf.d/xvfb.conf

@@ -1,3 +0,0 @@
-[program:xvfb]
-command=Xvfb :0 -screen 0 "%(ENV_DISPLAY_WIDTH)s"x"%(ENV_DISPLAY_HEIGHT)s"x24 -listen tcp -ac
-autorestart=true

entrypoint.sh

@@ -1,19 +1,4 @@
 #!/bin/bash
 set -ex
 
-RUN_FLUXBOX=${RUN_FLUXBOX:-yes}
-RUN_XTERM=${RUN_XTERM:-yes}
-
-case $RUN_FLUXBOX in
-  false|no|n|0)
-    rm -f /app/conf.d/fluxbox.conf
-    ;;
-esac
-
-case $RUN_XTERM in
-  false|no|n|0)
-    rm -f /app/conf.d/xterm.conf
-    ;;
-esac
-
 exec supervisord -c /app/supervisord.conf

passwd

@@ -0,0 +1 @@
+�шљ+�и§�

xstartup

@@ -0,0 +1,11 @@
+#!/bin/sh
+  
+# Uncomment the following two lines for normal desktop:
+# unset SESSION_MANAGER
+# exec /etc/X11/xinit/xinitrc
+
+[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
+[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
+xsetroot -solid grey
+vncconfig -iconic &
+startxfce4 &