From aa6ca069b865eda03e7006db687d049dc1314941 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Fri, 10 May 2024 14:25:48 +0200
Subject: [PATCH] Refactored

---
 app/app.sh | 19 ++++++-------------
 run.sh     |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/app.sh b/app/app.sh
index 0dc3228..04a92c9 100755
--- a/app/app.sh
+++ b/app/app.sh
@@ -1,16 +1,9 @@
 #!/bin/bash
 
-bail()
-{
-  while true; do
-    sleep 1
-  done;
-}
-
-export DISPLAY=:$DISPLAY_NUM
-echo Display at $DISPLAY
-exec Xvfb $DISPLAY -screen 0 1024x768x24 >/var/log/xvfb.log &
+export DISPLAY=:${DISPLAY_NUM}
+echo Display at ${DISPLAY} with ${SCREEN_W}x${SCREEN_H}x24
+exec Xvfb ${DISPLAY} -screen 0 ${SCREEN_W}x${SCREEN_H}x24 -shmem -pixdepths 1 4 8 15 16 24 32 -fakescreenfps 60 +xinerama -fbdir /tmp >/var/log/xvfb.log &
 exec icewm-session -o /var/log/icewm.log &
-exec socat TCP-LISTEN:60$DISPLAY_NUM,fork,bind=0.0.0.0 UNIX-CONNECT:/tmp/.X11-unix/X$DISPLAY_NUM &
-exec x11vnc -nowf -display $DISPLAY -forever -noxdamage -shared >/var/log/x11vnc.log 2>&1 &
-exec bash -
+exec socat TCP-LISTEN:60${DISPLAY_NUM},fork,bind=0.0.0.0 UNIX-CONNECT:/tmp/.X11-unix/X${DISPLAY_NUM} &
+exec x11vnc -nowf -display ${DISPLAY} -forever -noxdamage -shared >/var/log/x11vnc.log 2>&1
+
diff --git a/run.sh b/run.sh
index 134ff91..3d890bd 100755
--- a/run.sh
+++ b/run.sh
@@ -1,3 +1,3 @@
 #/bin/bash
 
-docker run --rm --net bridge -p 5910:5900/tcp -e DISPLAY_NUM=99 -it xserver-vnc
\ No newline at end of file
+docker run -d --rm --net bridge -p 5910:5900/tcp -e DISPLAY_NUM=99 -e SCREEN_W=1536 -e SCREEN_H=960 xserver-vnc