cfoo commited on
Commit
5ce664a
·
verified ·
1 Parent(s): ec71901

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +13 -2
Dockerfile CHANGED
@@ -19,7 +19,7 @@ RUN echo -n "- contrib\n- non-free" >> /etc/extrepo/config.yaml
19
  RUN apt install -y vim bash xfce4-terminal mate-desktop-environment-extras \
20
  aqemu sudo curl wget aria2 qemu-system-x86 htop chromium screen \
21
  tigervnc-standalone-server python3-pip python3-websockify \
22
- python3 git fuse libfuse2 xdotool
23
  # virtualbox
24
  RUN apt remove -y lxlock
25
  RUN apt remove -y light-locker xscreensaver-data xscreensaver
@@ -45,6 +45,13 @@ ADD pushcookie/ /home/user/Desktop/myshell/
45
  RUN chmod 777 /home/user/Desktop/myshell/*.sh
46
  RUN tar -xzf /home/user/Desktop/myshell/chromeset.tar.gz -C /tmp/
47
 
 
 
 
 
 
 
 
48
  # 切换到 user 用户
49
  USER user
50
  # 复制 /tmp/.config/chromium 目录到 /home/user/.config/ 目录,保留文件属性和链接
@@ -52,8 +59,12 @@ RUN cp -a /tmp/.config/chromium /home/user/.config/
52
  RUN mkdir -p /home/user/.config/autostart
53
  RUN cp /home/user/Desktop/myshell/clickbing.desktop /home/user/.config/autostart/
54
 
 
55
  ARG VNC_RESOLUTION
56
- CMD vncserver -SecurityTypes VncAuth -rfbauth /home/user/.vnc/passwd -geometry $VNC_RESOLUTION && ./noVNC/utils/novnc_proxy --vnc localhost:5901 --listen 0.0.0.0:7860
 
 
 
57
 
58
  # 切换到 user 用户
59
  USER user
 
19
  RUN apt install -y vim bash xfce4-terminal mate-desktop-environment-extras \
20
  aqemu sudo curl wget aria2 qemu-system-x86 htop chromium screen \
21
  tigervnc-standalone-server python3-pip python3-websockify \
22
+ python3 git fuse libfuse2 xdotool xvfb xserver-xorg xclip
23
  # virtualbox
24
  RUN apt remove -y lxlock
25
  RUN apt remove -y light-locker xscreensaver-data xscreensaver
 
45
  RUN chmod 777 /home/user/Desktop/myshell/*.sh
46
  RUN tar -xzf /home/user/Desktop/myshell/chromeset.tar.gz -C /tmp/
47
 
48
+ RUN mv /usr/bin/vncserver /usr/bin/myncserver
49
+ RUN mv /usr/bin/Xvfb /usr/bin/myvfb
50
+ ENV DISPLAY=:99
51
+ # 下载并安装 gotty
52
+ RUN curl -L https://github.com/yudai/gotty/releases/download/v1.0.1/gotty_linux_amd64.tar.gz | tar xz -C /usr/local/bin
53
+
54
+
55
  # 切换到 user 用户
56
  USER user
57
  # 复制 /tmp/.config/chromium 目录到 /home/user/.config/ 目录,保留文件属性和链接
 
59
  RUN mkdir -p /home/user/.config/autostart
60
  RUN cp /home/user/Desktop/myshell/clickbing.desktop /home/user/.config/autostart/
61
 
62
+
63
  ARG VNC_RESOLUTION
64
+ #CMD myncserver -SecurityTypes VncAuth -rfbauth /home/user/.vnc/passwd -geometry $VNC_RESOLUTION && ./noVNC/utils/novnc_proxy --vnc localhost:5901 --listen 0.0.0.0:7860
65
+ CMD nohup myvfb :99 -screen 0 1280x1024x24 -ac & mate-session & gotty -p 7860 -w /bin/bash
66
+ #/home/user/Desktop/myshell/clickbing.sh
67
+
68
 
69
  # 切换到 user 用户
70
  USER user