feat: deepn-webktop by systemd

用 systemd 启动 deepin dde23 ,不过有点灵车，dde桌面运行不正常
chenchongbiao · Sep 7, 2024 · c1faa32 · c1faa32
1 parent bffa975
commit c1faa32
Show file tree

Hide file tree

Showing 26 changed files with 758 additions and 28 deletions.
diff --git a/deepin-webtop/beige/Dockerfile b/deepin-webtop/beige/Dockerfile
@@ -584,6 +584,15 @@ RUN \
 # add local files
 COPY /root /
 
+RUN \
+  systemctl enable kasmvnc-config && \
+  systemctl enable video && \
+  systemctl enable adduser && \
+  systemctl enable pulseaudio && \
+  systemctl enable kasmvnc && \
+  systemctl enable kclient && \
+  systemctl enable dde
+
 # ports and volumes
 EXPOSE 3000 3001
 VOLUME /config

diff --git a/deepin-webtop/beige/docker-compose.yml b/deepin-webtop/beige/docker-compose.yml
@@ -1,18 +1,18 @@
 version: '3.8'
 
 services:
-  systemd_test:
+  deepin-webtop:
+    image: chenchongbiao/deepin-webtop
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: systemd_test
+    container_name: deepin-webtop
     privileged: true
     cap_add:
       - SYS_ADMIN
     security_opt:
       - seccomp:unconfined
     tmpfs:
-      - /tmp
       - /run
       - /run/lock
     ports:
@@ -24,37 +24,16 @@ services:
       - SUBFOLDER=/ #optional
       - TITLE=Webtop #optional
       - https_proxy=http://10.20.42.187:7890
-      - DOCKER_MODS=linuxserver/mods:universal-package-install 
+      - DOCKER_MODS=linuxserver/mods:universal-package-install
       - INSTALL_PACKAGES=fonts-noto-cjk
       - LC_ALL=zh_CN.UTF-8
     volumes:
       - ./data:/config
+      # - ./startwm.sh:/defaults/startwm.sh
+      # - ./root/kasminit:/kasminit
       - /var/run/docker.sock:/var/run/docker.sock #optional
     devices:
       - /dev/dri:/dev/dri #optional
     shm_size: "1gb" #optional
     cgroup_parent: docker.slice
     restart: unless-stopped
-
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Asia/Shanghai
-      - SUBFOLDER=/ #optional
-      - TITLE=Webtop #optional
-      - https_proxy=http://10.20.42.187:7890
-      - DOCKER_MODS=linuxserver/mods:universal-package-install 
-      - INSTALL_PACKAGES=fonts-noto-cjk
-      - LC_ALL=zh_CN.UTF-8
-      - XDG_SESSION_TYPE=x11
-      - XDG_SESSION_DESKTOP=dde-x11
-      - XDG_CURRENT_DESKTOP=DDE
-    volumes:
-      - ./data:/config
-      - ./startwm.sh:/defaults/startwm.sh
-      - /var/run/docker.sock:/var/run/docker.sock #optional
-    ports:
-      - 3002:3000
-    devices:
-      - /dev/dri:/dev/dri #optional
-    shm_size: "1gb" #optional
diff --git a/deepin-webtop/beige/root/defaults/autostart b/deepin-webtop/beige/root/defaults/autostart
@@ -0,0 +1 @@
+xterm
diff --git a/deepin-webtop/beige/root/defaults/default.conf b/deepin-webtop/beige/root/defaults/default.conf
@@ -0,0 +1,102 @@
+server {
+  #auth_basic               "Login";
+  #auth_basic_user_file     /etc/nginx/.htpasswd;
+  listen 3000 default_server;
+  listen [::]:3000 default_server;
+  location / {
+    proxy_http_version      1.1;
+    proxy_set_header        Host $host;
+    proxy_set_header        Upgrade $http_upgrade;
+    proxy_set_header        Connection "upgrade";
+    proxy_set_header        X-Real-IP $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header        X-Forwarded-Proto $scheme;
+    proxy_set_header        Cookie "";
+    proxy_read_timeout      3600s;
+    proxy_send_timeout      3600s;
+    add_header              'Access-Control-Allow-Origin' '*' always;
+    add_header              'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+    add_header              'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since';
+    add_header              'Access-Control-Allow-Credentials' 'true';
+    add_header              'Cross-Origin-Embedder-Policy' 'require-corp';
+    add_header              'Cross-Origin-Opener-Policy' 'same-origin';
+    add_header              'Cross-Origin-Resource-Policy' 'same-site';
+    proxy_pass               http://127.0.0.1:6900;
+    proxy_buffering          off;
+  }
+
+  location SUBFOLDERwebsockify {
+    proxy_http_version      1.1;
+    proxy_set_header        Host $host;
+    proxy_set_header        Upgrade $http_upgrade;
+    proxy_set_header        Connection "upgrade";
+    proxy_set_header        X-Real-IP $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header        X-Forwarded-Proto $scheme;
+    proxy_set_header        Cookie "";
+    proxy_read_timeout      3600s;
+    proxy_send_timeout      3600s;
+    add_header              'Access-Control-Allow-Origin' '*' always;
+    add_header              'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+    add_header              'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since';
+    add_header              'Access-Control-Allow-Credentials' 'true';
+    add_header              'Cross-Origin-Embedder-Policy' 'require-corp';
+    add_header              'Cross-Origin-Opener-Policy' 'same-origin';
+    add_header              'Cross-Origin-Resource-Policy' 'same-site';
+    proxy_pass               http://127.0.0.1:6901;
+    proxy_buffering          off;
+  }
+}
+
+server {
+  #auth_basic               "Login";
+  #auth_basic_user_file     /etc/nginx/.htpasswd;
+  listen 3001 ssl;
+  listen [::]:3001 ssl;
+  ssl_certificate           /config/ssl/cert.pem;
+  ssl_certificate_key       /config/ssl/cert.key;
+  location / {
+    proxy_http_version      1.1;
+    proxy_set_header        Host $host;
+    proxy_set_header        Upgrade $http_upgrade;
+    proxy_set_header        Connection "upgrade";
+    proxy_set_header        X-Real-IP $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header        X-Forwarded-Proto $scheme;
+    proxy_set_header        Cookie "";
+    proxy_read_timeout      3600s;
+    proxy_send_timeout      3600s;
+    add_header              'Access-Control-Allow-Origin' '*' always;
+    add_header              'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+    add_header              'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since';
+    add_header              'Access-Control-Allow-Credentials' 'true';
+    add_header              'Cross-Origin-Embedder-Policy' 'require-corp';
+    add_header              'Cross-Origin-Opener-Policy' 'same-origin';
+    add_header              'Cross-Origin-Resource-Policy' 'same-site';
+    proxy_pass               http://127.0.0.1:6900;
+    proxy_buffering          off;
+  }
+
+  location SUBFOLDERwebsockify {
+    proxy_http_version      1.1;
+    proxy_set_header        Host $host;
+    proxy_set_header        Upgrade $http_upgrade;
+    proxy_set_header        Connection "upgrade";
+    proxy_set_header        X-Real-IP $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header        X-Forwarded-Proto $scheme;
+    proxy_set_header        Cookie "";
+    proxy_read_timeout      3600s;
+    proxy_send_timeout      3600s;
+    add_header              'Access-Control-Allow-Origin' '*' always;
+    add_header              'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+    add_header              'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since';
+    add_header              'Access-Control-Allow-Credentials' 'true';
+    add_header              'Cross-Origin-Embedder-Policy' 'require-corp';
+    add_header              'Cross-Origin-Opener-Policy' 'same-origin';
+    add_header              'Cross-Origin-Resource-Policy' 'same-site';
+    proxy_pass               http://127.0.0.1:6901;
+    proxy_buffering          off;
+  }
+}
+
diff --git a/deepin-webtop/beige/root/defaults/menu.xml b/deepin-webtop/beige/root/defaults/menu.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openbox_menu xmlns="http://openbox.org/3.4/menu">
+<menu id="root-menu" label="MENU">
+<item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
+</menu>
+</openbox_menu>
diff --git a/deepin-webtop/beige/root/defaults/startwm.sh b/deepin-webtop/beige/root/defaults/startwm.sh
@@ -18,4 +18,6 @@ setterm blank 0
 setterm powerdown 0
 
 # Launch DE
-/usr/bin/dde-session > /dev/null 2>&1
+/usr/bin/dde-session & > /dev/null 2>&1
+/usr/bin/dde-desktop & > /dev/null 2>&1
+/usr/bin/dde-shell