From 4382503c9dd008e83530fe81a5db147517fd17c0 Mon Sep 17 00:00:00 2001
From: daniel <contact@danni.cool>
Date: Sat, 29 Jun 2024 22:39:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile             |  4 ----
 linux/sh/entrypoint.sh | 25 ++-----------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 38c8b60..f980f89 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -84,10 +84,6 @@ COPY linux/.fluxbox /home/docker/.fluxbox
 COPY linux/conf.d/* /etc/supervisor/conf.d/
 COPY linux/sh/entrypoint.sh /etc/entrypoint.sh
 
-RUN chmod +x /etc/entrypoint.sh
-
-USER docker
-
 ENTRYPOINT ["/bin/bash","/etc/entrypoint.sh"]
 
 EXPOSE 8080 22 3001
diff --git a/linux/sh/entrypoint.sh b/linux/sh/entrypoint.sh
index 49394b9..7e2be50 100755
--- a/linux/sh/entrypoint.sh
+++ b/linux/sh/entrypoint.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
-
 function check_vnc_pass {
   if [[ -n $VNC_PASSWORD ]]; then
     local VNC_PASSWD_PATH="/home/docker/.vnc/passwd"
     rm -f $VNC_PASSWD_PATH
-    if [[ ! -d "/home/docker/.vnc" ]]; then mkdir -p /home/docker/.vnc; fi
+    if [[ ! -d "/home/docker/.vnc" ]]; then mkdir -p /home/docker/.vnc;fi
     x11vnc -storepasswd "$VNC_PASSWORD" "$VNC_PASSWD_PATH"
     export X11_ARGS="-rfbauth $VNC_PASSWD_PATH"
     chown docker $VNC_PASSWD_PATH
@@ -39,24 +38,4 @@ if [ "$(id -u)" -eq 0 ]; then
   exec su docker -c "/etc/entrypoint.sh"
 fi
 
-# 从这里开始的命令都以 docker 用户执行
-# Start Xvfb
-Xvfb :0 -screen 0 1024x768x16 &
-
-# Start PulseAudio
-pulseaudio --start
-
-# Start winbind service
-service winbind start
-
-# Initialize wine
-wineboot --init
-
-# Ensure DISPLAY is set correctly
-export DISPLAY=:0
-
-# Run winetricks after Xvfb has started
-winetricks corefonts vcrun6
-
-# Start supervisord
-exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
+/usr/bin/supervisord