Updated at 2025-01-17 17:49:24+08:00

PIKACHUIM · Jan 17, 2025 · b076044 · b076044
1 parent 912cb1e
commit b076044
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 26 deletions.
diff --git a/Dockers/ArchOS/Desktops/Deepin b/Dockers/ArchOS/Desktops/Deepin
@@ -27,6 +27,7 @@ RUN echo 'export DISPLAY=:9 &&export $(dbus-launch)' >> /run.sh
 RUN echo 'nohup Xvfb :9 -ac -screen 0 1600x900x24 &' >> /run.sh
 RUN echo 'chmod +x /x11vnc.sh && export HOME=/root ' >> /run.sh
 RUN echo 'bash /x11vnc.sh && nohup startdde &      ' >> /run.sh
+RUN chmod +x /run.sh
 
 # Port Mapping ------------------------------------------------
 EXPOSE 4000/tcp                                                                                                        

diff --git a/Dockers/ArchOS/Desktops/GNOME3 b/Dockers/ArchOS/Desktops/GNOME3
@@ -22,6 +22,7 @@ RUN echo 'export DISPLAY=:9 &&export $(dbus-launch)' >> /run.sh
 RUN echo 'nohup Xvfb :9 -ac -screen 0 1600x900x24 &' >> /run.sh
 RUN echo 'chmod +x /x11vnc.sh && export HOME=/root ' >> /run.sh
 RUN echo 'bash /x11vnc.sh && nohup gnome-session & ' >> /run.sh           
+RUN chmod +x /run.sh
 
 # Port Mapping ------------------------------------------------
 EXPOSE 4000/tcp

diff --git a/Dockers/ArchOS/Desktops/Plasma b/Dockers/ArchOS/Desktops/Plasma
@@ -27,6 +27,7 @@ RUN echo 'export DISPLAY=:9 &&export $(dbus-launch)' >> /run.sh
 RUN echo 'nohup Xvfb :9 -ac -screen 0 1600x900x24 &' >> /run.sh
 RUN echo 'chmod +x /x11vnc.sh && export HOME=/root ' >> /run.sh
 RUN echo 'bash /x11vnc.sh &&nohup startplasma-x11 &' >> /run.sh                    
+RUN chmod +x /run.sh
 
 # Port Mapping ------------------------------------------------
 EXPOSE 4000/tcp                                                                                                        

diff --git a/Dockers/ArchOS/Desktops/Xfce4L b/Dockers/ArchOS/Desktops/Xfce4L
@@ -27,7 +27,8 @@ RUN echo 'export DISPLAY=:9 &&export $(dbus-launch)' >> /run.sh
 RUN echo 'nohup Xvfb :9 -ac -screen 0 1600x900x24 &' >> /run.sh
 RUN echo 'chmod +x /x11vnc.sh && export HOME=/root ' >> /run.sh
 RUN echo 'bash /x11vnc.sh && nohup xfce4-session & ' >> /run.sh 
-
+RUN chmod +x /run.sh  
+
 # Port Mapping ------------------------------------------------
 EXPOSE 4000/tcp
 CMD ["/sbin/init"]
diff --git a/Dockers/Fedora/Desktops/Deepin b/Dockers/Fedora/Desktops/Deepin
@@ -7,6 +7,7 @@ FROM pikachuim/${OS_SYSTEMS}:${OS_VERSION}-x11gui
 # Install -----------------------------------------------------    
 #RUN mv /etc/pulse/default.pa /etc/pulse/default.pa.docker.bak   
 RUN dnf update -y && dnf group install "Deepin Desktop" -y                            
+RUN dnf install -y xorg-x11-server-Xvfb dbus-x11 x11vnc xrdp
 
 # Desktop Configs ---------------------------------------------
 
@@ -21,6 +22,7 @@ RUN echo 'export DISPLAY=:9 &&export $(dbus-launch)' >> /run.sh
 RUN echo 'nohup Xvfb :9 -ac -screen 0 1600x900x24 &' >> /run.sh
 RUN echo 'chmod +x /x11vnc.sh && export HOME=/root ' >> /run.sh
 RUN echo 'bash /x11vnc.sh && nohup startdde &      ' >> /run.sh
+RUN chmod +x /run.sh
 
 # Port Mapping ------------------------------------------------
 EXPOSE 4000/tcp                                                                                                        

diff --git a/Dockers/Fedora/Desktops/GNOME3 b/Dockers/Fedora/Desktops/GNOME3
@@ -6,9 +6,10 @@ FROM pikachuim/${OS_SYSTEMS}:${OS_VERSION}-x11gui
 
 # Install -----------------------------------------------------
 RUN dnf update -y && dnf group install -y gnome-desktop                    
-
+RUN dnf install -y xorg-x11-server-Xvfb dbus-x11 x11vnc xrdp
+
 # Desktop Configs ---------------------------------------------
-#RUN systemctl disable gdm && service gdm stop || echo "Ignored"
+RUN systemctl disable gdm && service gdm stop || echo "Ignored"
 
 # X11VNC Root Set ---------------------------------------------
 COPY X11GUI/x11vnc.sh /x11vnc.sh
@@ -17,7 +18,9 @@ COPY X11GUI/x11vnc.sh /x11vnc.sh
 RUN echo 'export DISPLAY=:9 &&export $(dbus-launch)' >> /run.sh
 RUN echo 'nohup Xvfb :9 -ac -screen 0 1600x900x24 &' >> /run.sh
 RUN echo 'chmod +x /x11vnc.sh && export HOME=/root ' >> /run.sh
+RUN echo 'systemctl disable gdm && service gdm stop' >> /run.sh
 RUN echo 'bash /x11vnc.sh && nohup gnome-session & ' >> /run.sh         
+RUN chmod +x /run.sh
 
 # Port Mapping ------------------------------------------------
 EXPOSE 4000/tcp

diff --git a/Dockers/Fedora/Desktops/Plasma b/Dockers/Fedora/Desktops/Plasma
@@ -6,6 +6,7 @@ FROM pikachuim/${OS_SYSTEMS}:${OS_VERSION}-x11gui
 # Install -----------------------------------------------------
 #RUN mv /etc/pulse/default.pa        /etc/pulse/default.pa.bak 
 RUN dnf update -y &&dnf groupinstall -y "KDE Plasma Workspaces"                            
+RUN dnf install -y xorg-x11-server-Xvfb dbus-x11 x11vnc xrdp
 
 # X11VNC Root Set ---------------------------------------------
 COPY X11GUI/x11vnc.sh /x11vnc.sh
@@ -22,7 +23,8 @@ RUN echo 'killall plasma_session & killall kwin_x11' >> /run.sh
 RUN echo 'export DISPLAY=:9 &&export $(dbus-launch)' >> /run.sh
 RUN echo 'nohup Xvfb :9 -ac -screen 0 1600x900x24 &' >> /run.sh
 RUN echo 'chmod +x /x11vnc.sh && export HOME=/root ' >> /run.sh
-RUN echo 'bash /x11vnc.sh &&nohup startplasma-x11 &' >> /run.sh                    
+RUN echo 'bash /x11vnc.sh &&nohup plasma_session &' >> /run.sh                    
+RUN chmod +x /run.sh
 
 # Port Mapping ------------------------------------------------
 EXPOSE 4000/tcp                                                                                                        

diff --git a/Dockers/Fedora/Desktops/Server b/Dockers/Fedora/Desktops/Server
@@ -34,6 +34,7 @@ RUN groupadd -r -g 2000 user &&  useradd -u 2000 -m -r -g user user    \
 # Init -----------------------------------------------------------------
 COPY Config/StartUP/run.service /etc/systemd/system/
 COPY Config/StartUP/run.sh /run.sh
+RUN chmod +x /run.sh
 RUN systemctl enable run
 
 # Port Mapping ---------------------------------------------------------

diff --git a/Dockers/Fedora/Desktops/X11GUI b/Dockers/Fedora/Desktops/X11GUI
@@ -16,7 +16,8 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d
 
 # Install Xserver ---------------------------------------------
 RUN yum update  -y && yum install -y @base-x wget curl git vim\
-    dbus-x11 xinit neofetch                
+    dbus-x11 xinit neofetch
+RUN dnf install -y xorg-x11-server-Xvfb dbus-x11 x11vnc	xrdp
 
 # Install Nomachine -------------------------------------------
 ENV NX="download/8.15/Linux/nomachine_8.15.3_1_x86_64.rpm"
@@ -44,6 +45,7 @@ RUN echo 'export DISPLAY=:0'                        >> /run.sh \
 &&  echo 'echo Starting NX ----------------------'  >> /run.sh \
 &&  echo '/etc/NX/nxserver --startup'               >> /run.sh \
 &&  echo '/etc/NX/nxserver --restart'               >> /run.sh      
+RUN chmod +x /run.sh
 
 # Port Mapping ------------------------------------------------
 EXPOSE 4000/tcp

diff --git a/Dockers/Fedora/Desktops/Xfce4L b/Dockers/Fedora/Desktops/Xfce4L
@@ -6,6 +6,7 @@ FROM pikachuim/${OS_SYSTEMS}:${OS_VERSION}-x11gui
 
 # Install -----------------------------------------------------
 RUN dnf update -y && dnf group install -y "Xfce Desktop"        
+RUN dnf install -y xorg-x11-server-Xvfb dbus-x11 x11vnc xrdp
 
 # X11VNC Root Set ---------------------------------------------
 COPY X11GUI/x11vnc.sh /x11vnc.sh
@@ -22,7 +23,7 @@ RUN echo 'export DISPLAY=:9 &&export $(dbus-launch)' >> /run.sh
 RUN echo 'nohup Xvfb :9 -ac -screen 0 1600x900x24 &' >> /run.sh
 RUN echo 'chmod +x /x11vnc.sh && export HOME=/root ' >> /run.sh
 RUN echo 'bash /x11vnc.sh && nohup xfce4-session & ' >> /run.sh    
-
+RUN chmod +x /run.sh
 
 # Port Mapping ------------------------------------------------
 EXPOSE 4000/tcp

diff --git a/README.md b/README.md
@@ -22,20 +22,33 @@ RDPDocker is a Docker image building and container creation tool with X11 and de
 
 
 
-### 各个系统桌面支持情况
-
-| 系统名称<br/>System Name | 系统版本<br/>System Version | Server |  Lingmo   |   GNOME    |  Xfce 4   | Deepin DE |  Plasma   | X11 GUI |
-| :----------------------: | :-------------------------: | :----: | :-------: | :--------: | :-------: | :-------: | :-------: | :-----: |
-|          Ubuntu          |            24.04            |   ✔️    |     ✔️     | ✔️VNC会报错 |     ✔️     | ❌源未支持 |     ✔️     |    ✔️    |
-|          Ubuntu          |            22.04            |   ✔️    | ❌源未支持 |     ✔️      |     ✔️     | ✔️NX连不上 |     ✔️     |    ✔️    |
-|          Ubuntu          |            20.04            |   ✔️    | ❌源未支持 |     ✔️      |     ✔️     | ❌源未支持 |     ✔️     |    ✔️    |
-|          Debian          |            13.00            |   ✔️    | ❌源未支持 | ✔️VNC连不上 |     ✔️     | ❌源未支持 | ✔️仅NX能连 |    ✔️    |
-|          Debian          |            12.00            |   ✔️    | ✔️NX连不上 | ✔️VNC连不上 |     ✔️     | ❌编译报错 | ✔️仅NX能连 |    ✔️    |
-|          Debian          |            11.00            |   ✔️    | ❌源未支持 | ✔️VNC连不上 |     ✔️     | ❌源未支持 | ✔️仅NX能连 |    ✔️    |
-|          ArchOS          |            devel            |   ✔️    | ❌源未支持 | ✔️尚未测试  | ✔️尚未测试 | ✔️尚未测试 | ✔️尚未测试 |    ✔️    |
-|          Fedora          |            40.00            |   ✔️    | ❌源未支持 | ✔️尚未测试  | ✔️尚未测试 | ✔️尚未测试 | ✔️尚未测试 |    ✔️    |
-
-## Desktop桌面展示
+### Support DE / 各个系统桌面支持情况
+
+| 系统名称<br/>System Name | 系统版本<br/>System Version | Server |  Lingmo   |     GNOME     |  Xfce 4   |  Deepin DE   |    Plasma    | X11 GUI |
+| :----------------------: | :-------------------------: | :----: | :-------: | :-----------: | :-------: | :----------: | :----------: | :-----: |
+|          Ubuntu          |            24.04            |   ✔️    |     ✔️     | ✔️VNC会报错(1) |     ✔️     |  ❌源未支持   |      ✔️       |    ✔️    |
+|          Ubuntu          |            22.04            |   ✔️    | ❌源未支持 |       ✔️       |     ✔️     | ✔️NX连不上(4) |      ✔️       |    ✔️    |
+|          Ubuntu          |            20.04            |   ✔️    | ❌源未支持 |       ✔️       |     ✔️     |  ❌源未支持   |      ✔️       |    ✔️    |
+|          Debian          |            13.00            |   ✔️    | ❌源未支持 | ✔️VNC连不上(1) |     ✔️     |  ❌源未支持   | ✔️仅NX能连(2) |    ✔️    |
+|          Debian          |            12.00            |   ✔️    | ✔️NX连不上 | ✔️VNC连不上(1) |     ✔️     |  ❌编译报错   | ✔️仅NX能连(2) |    ✔️    |
+|          Debian          |            11.00            |   ✔️    | ❌源未支持 | ✔️VNC连不上(1) |     ✔️     |  ❌源未支持   | ✔️仅NX能连(2) |    ✔️    |
+|          ArchOS          |            devel            |   ✔️    | ❌源未支持 |   ✔️尚未测试   | ✔️尚未测试 |  ✔️尚未测试   |  ✔️尚未测试   |    ✔️    |
+|          Fedora          |            40.00            |   ✔️    | ❌源未支持 | ✔️桌面报错(1)  |   ✔️*(3)   |      ✔️       |      ✔️       |    ✔️    |
+
+### Known Issues / 一些已知的问题
+
+- (1)部分GNOME系统VNC连不上，或者桌面首次打开会报错，点击确认后黑屏，解决办法
+  - 登录到docker内部bash：`docker exec -it <DockerName> bash`
+  - 执行：`export DISPLAY=:9 &&export $(dbus-launch)`
+  - 执行：`nohup gnome-session & `
+- (2)部分KDE Plasma环境，无法通过VNC或者RDP连接，暂时无法解决
+- (3)部分Xfce 4环境，只能通过root帐号登录，非root需要root授权
+- (4)部分Deepin DE环境，NoMachine无法点击登录按钮，可以绕过：
+  - 在登录界面，点击关机按钮，但不要确认关机
+  - 按下键盘的ESC键，你会发现可以输入密码了
+- (5)部分Lingmo系统dock无法加载，或者只能通过NoMachine连接
+
+## Desktop 桌面展示
 
 ### Lingmo
 

diff --git a/TEXT_PATH b/TEXT_PATH
@@ -0,0 +1 @@
+Docker Container: S1V3-OCI-00-CD1
diff --git a/index.html b/index.html