Restore tightvncserver, disable GUI UTs

ron190 · Jan 25, 2025 · 13056fe · 13056fe
1 parent 0b04469
commit 13056fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/model/src/test/resources/docker/Dockerfile.jsql b/model/src/test/resources/docker/Dockerfile.jsql
@@ -23,7 +23,7 @@ ENV USER vnc-user-jsql
 RUN apt-get update -y || true
 
 # Install VNC support, shell and network tools
-RUN apt-get install xfce4 xfce4-goodies xfonts-base dos2unix iproute2 net-tools iputils-ping git -y
+RUN apt-get install tightvncserver xfonts-base dos2unix iproute2 net-tools iputils-ping git -y
 
 RUN dos2unix /model/src/test/resources/vnc/execute-on-vnc.sh
 

diff --git a/model/src/test/resources/vnc/execute-on-vnc.sh b/model/src/test/resources/vnc/execute-on-vnc.sh
@@ -26,15 +26,9 @@ EOF
 chmod 600 "$HOME/.vnc/passwd"
 
 OLD_DISPLAY=${DISPLAY}
+vncserver ":${NEW_DISPLAY}" -localhost -geometry 800x600 -depth 16
 export DISPLAY=:${NEW_DISPLAY}
 
-unset SESSION_MANAGER
-unset DBUS_SESSION_BUS_ADDRESS
-/usr/bin/startxfce4 || true
-[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup || true
-[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources || true
-(x-window-manager &) || true
-
 echo MAVEN_NASHORN="${MAVEN_NASHORN}"
 echo MAVEN_BYTEBUDDY="${MAVEN_BYTEBUDDY}"