Skip to content

Commit

Permalink
feat: 🎸 调整权限
Browse files Browse the repository at this point in the history
  • Loading branch information
danni-cool committed Jun 29, 2024
1 parent 36c7d28 commit 4382503
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 27 deletions.
4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
25 changes: 2 additions & 23 deletions linux/sh/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

0 comments on commit 4382503

Please sign in to comment.