diff --git a/Changelog.md b/Changelog.md index 8475362..cd2d030 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,4 @@ -# changeLog +# Changelog ## v0 diff --git a/Detail.md b/Detail.md index 41fcd29..0dea50a 100644 --- a/Detail.md +++ b/Detail.md @@ -1,89 +1,65 @@ +**Producttion** + +`AMD64/ARM64` supported, Producttion prefer with `docker-compose`. [docker-compose.yml](./docker-compose.yml) [docker-compose-livecd.yml](./docker-compose-livecd.yml) + +- [CloudDesktop](./_doc/CloudDesktop.md) +- [生产部署指引](./_doc/生产部署指引.md) +- [使用手册](./_doc/使用手册.md) +- [适用场景与问题](./_doc/适用场景与问题.md) + **Tags** TAG | Distro | DESK | INPUT | STARTER | IMAGE |Star|Descrition --- | --- | --- | --- | --- | --- | --- | --- latest |Ubuntu| xfce | ibus | supervisor | [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/latest)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)|★★★★★|Customize,Lightweight sogou |Ubuntu| xfce | fcitx | supervisor | [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/sogou)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)|★★★★★|sogouInput -core |Ubuntu| flux | - | supervisor | [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/core)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)|★★★★☆|ConfigureLayer,Debug +core |Ubuntu| flux | - | supervisor | [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/core)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)|★★★★☆|ConfigLayer,Firefox ---|---|---|---|---|---|--- cmate |Mint| mate | ibus | systemd | [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/cmate)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)|★★★★★|GoodExperience cxfce |Mint| xfce | ibus | systemd | [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/cxfce)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)|★★★★★|Xfce 4.16 cinna |Mint| cinnamon | ibus | systemd | [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/cinna)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)|★★★★☆|VideoCard Notify gnome |Ubuntu| gnome | ibus | systemd | [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/gnome)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)|★★★★★|Best Compatible -plas |Kubuntu| plasma | ibus | systemd | [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/plas)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)|★★★★☆|Black area with Settings - -**ImageLayers** - -![](./_doc/mannual/res/design/RDesktop_IMAGE.png) - -## Producttion - -x86/arm64 supported, Producttion prefer with `docker-compose` - -- [docker-compose.yml](./docker-compose.yml) (latest,sogou,core) -- [docker-compose-livecd.yml](./docker-compose-livecd.yml) (gnome,plas,cinna,cmate,cxfce x5) +plasma |Kubuntu| plasma | ibus | systemd | [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/plasma)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)|★★★★☆|Black area with Settings ```bash -# supvervisor: core, latest, sogou (--privileged: xrdp-disk-mount) -docker run -d -p 10081:10081 -p 10089:10089 --shm-size 1g \ - infrastlabs/docker-headless:sogou -``` - -**(1)resetPass**: non-production usage with default password!! - -```bash -SSH_PASS=xxx VNC_PASS=xxx2 VNC_PASS_RO=xxx3 +# non-production usage with default password!! +SSH_PASS=ChangeMe VNC_PASS=ChangeMe2 VNC_PASS_RO=ChangeMe3 echo "headless:$SSH_PASS" |sudo chpasswd echo -e "$VNC_PASS\n$VNC_PASS\ny\n$VNC_PASS_RO\n$VNC_PASS_RO" |sudo vncpasswd /etc/xrdp/vnc_pass; sudo chmod 644 /etc/xrdp/vnc_pass ``` -**(2)UserManual**: - -- [CloudDesktop Introduce](./_doc/mannual/01-CloudDesktop.md) -- [Next TODO](./_doc/mannual/b0-todo.md) -- [1.How to set Locale?](./_doc/mannual/b1-locale.md) -- [2.Usage of Double-Screen, ClipBoard, Audio?](./_doc/mannual/b2-rdp.md) -- [3.Web entry of desktop?](./_doc/mannual/b3-vnc.md) -- [4.Usage of IBUS/Flameshot](./_doc/mannual/b4-apps.md) -- [Details](./detail.md) （Hotkeys, Envs, SysApps） +**ImageLayers** -**(3)Producttion-Deployment**: +![](./_doc/res/design/RDesktop_IMAGE.png) -- [Windows-VM Deployment：](./_doc/deploy/win-vbox/README.md) With `barge-os` mini-container system, `--net=host` Use the VM's IP -- [Linux-Server Deployment：](./_doc/deploy/fat-docker/README.md) Use `macvlan`'s network，with special IP，sugest with lxcfs installed. -- [Kubernetes Deployment：](./_doc/deploy/k8s-headless/README.md) Deployment+Service +**Detail** -## Detail +（Hotkeys, Envs, SysApps） - Size: latest: `168.347 MB`, slim: `88.929 MB`, full: `289.581 MB` - User: `headless`, SSHPass: `headless`, VNCPass: `headless`, VNCPassReadOnly: `View123` - Ports - - novnc 6080 > 10081 (http+https) - - bcs 9222 > 10082 #pulseaudio broadcast to web-mp3 stream + - novnc 6080 > 10081 (wsvnc+broadcast's mp3-stream) - xrdp 3389 > 10089 - sshd 22 > 10022 - - - vnc: 6000/tcp - - pulse: 4713/tcp + - vnc: 6000/tcp (+offset: 10) + - pulse: 4713/tcp (default: uds) - Entry: xrdp, novnc, dropbear -- 命令工具：`tree htop gawk expect tmux rsync iproute2` -- 图形工具：`sakura tint2 plank flameshot`, `gnome-system-monitor engrampa ristretto` -- tzdata时区, ttf-wqy-microhei字体, ibus-rime输入法, - oh-my-bash, docker-dind +- Misc: `tree htop gawk expect tmux rsync iproute2` +- GUI: `sakura tint2 plank flameshot`, `gnome-system-monitor engrampa ristretto` +- TZ/Font/Input: tzdata, ttf-wqy-microhei, ibus-rime -**0.Xserver多开** (桌面网关) - -用于其它镜像图像化桌面反向连接上来, 参考: [DE/docker-compose.yml](./DE/docker-compose.yml) +**0.HostGUIApps** ```bash -export DISPLAY=192.168.0.x:21 #远程图像显示 -export PULSE_SERVER=tcp:192.168.0.x:4721 #远程声音 -# ./xx 启动图形化应用 +export DISPLAY=:10 +export PULSE_SERVER=tcp:127.0.0.1:4721 #audio +# ./guiApps ``` -![](https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/mannual/res/design-MultiBox.png) - **1.HotKeys** - HotKeys `super: Alt` @@ -105,17 +81,14 @@ ENV \ SSH_PORT=10022 \ RDP_PORT=10089 \ VNC_PORT=10081 \ - BCS_PORT=10082 \ # SSH_PASS=headless \ VNC_PASS=headless \ VNC_PASS_RO=View123 \ - # - VNC_SSL_ONLY=false \ - VNC_CERT= \ - VNC_OFFSET=0 \ - VNC_LIMIT=1 \ - # L=zh_CN \ + # VNC_SSL_ONLY=false \ + # VNC_CERT= \ + VNC_OFFSET=10 \ + L=zh_CN \ TZ=Asia/Shanghai ``` diff --git a/README.md b/README.md index 3afff7e..e9af878 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # docker-headless -Multi-Desktop with `XRDP/NOVNC/PulseAudio` based on `Ubuntu20.04`, Formatting a HeadlessBox/Cloud Desktop. +Multi-Desktop with `XRDP/NOVNC/PulseAudio` based on `Ubuntu20.04`, Formatting a HeadlessBox/Cloud Desktop. [[Detail]](./Detail.md) [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/latest)](https://hub.docker.com/r/infrastlabs/docker-headless/tags) [![Docker Pulls](https://img.shields.io/docker/pulls/infrastlabs/docker-headless.svg)](https://hub.docker.com/r/infrastlabs/docker-headless) @@ -17,7 +17,7 @@ noVnc | https://192.168.0.x:10081 | `headless` | `View123` RDP | 192.168.0.x:10089 | `headless` | - SSH | ssh -p 10022 headless@192.168.0.x | `headless` | - -![](https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/mannual/res/01rdp-double-screen.png) +![](https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/res/01rdp-double-screen.png) **Design** @@ -28,7 +28,7 @@ SSH | ssh -p 10022 headless@192.168.0.x | `headless` | - - Desktop apps: ibus-rime/fcitx-sogou, flameshot, PAC. - Slim image: `core: 170.53 MB(fluxbox)`, `latest: 277.48 MB(ibus,xfce4.14)`, `sogou: 354.15 MB(fcitx)` -![](./_doc/mannual/res/design/RDesktop.png) +![](./_doc/res/design/RDesktop.png) ## step3: UseCase diff --git a/README_zh.md b/README_zh.md index b3026a2..e6674cb 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,6 +1,6 @@ **Docker云桌面**（docker-headless） -基于`Ubuntu20.04`胖容器+远程接入, 实现`Linux`下私人桌面、云端办公。在生产跑浏览器做调试/维护。在服务器搭建专用开发环境，公司/Home互通办公。镜像体积小、支持多语言、提供多桌面 +基于`Ubuntu20.04`胖容器+远程接入, 实现`Linux`下私人桌面、云端办公。在生产跑浏览器做调试/维护。在服务器搭建专用开发环境，公司/Home互通办公。镜像体积小、支持多语言、提供多桌面 [[Detail]](./Detail.md) [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/latest)](https://hub.docker.com/r/infrastlabs/docker-headless/tags) [![Docker Pulls](https://img.shields.io/docker/pulls/infrastlabs/docker-headless.svg)](https://hub.docker.com/r/infrastlabs/docker-headless) @@ -17,7 +17,7 @@ noVnc | http://192.168.0.x:10081 | `headless` | `View123` RDP | 192.168.0.x:10089 | `headless` | - SSH | ssh -p 10022 headless@192.168.0.x | `headless` | - -![](https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/mannual/res/01rdp-double-screen.png) +![](https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/res/01rdp-double-screen.png) **二、设计说明** @@ -27,14 +27,14 @@ SSH | ssh -p 10022 headless@192.168.0.x | `headless` | - - 多桌面：Xfce,Mate,Cinnamon,Gnome,Plasma - 小体积：镜像层复用、小巧精简 `core: 170.53 MB`, `latest: 277.48 MB`, `sogou: 354.15 MB` -![](./_doc/mannual/res/design/RDesktop.png) +![](./_doc/res/design/RDesktop.png) **三、使用示例** 多语言快速体验: `docker run -it --rm --shm-size 1g -e VNC_OFFSET=20 -e L=zh_CN --net=host infrastlabs/docker-headless:latest`, 推荐[docker-compose.yml](./docker-compose.yml) ```bash -# LiveCD Experience: gnome/plas, mint-series only with x86(cinna, cmate, cxfce) +# LiveCD Experience: gnome/plasma, mint-series only with x86(cinna, cmate, cxfce) # Plasma/Mint with START_SYSTEMD=false docker run -it --rm --net=host --shm-size 1g \ -e L=en_US -e VNC_OFFSET=99 -e START_SYSTEMD=false \ diff --git a/_doc/CloudDesktop.md b/_doc/CloudDesktop.md new file mode 100644 index 0000000..c71c101 --- /dev/null +++ b/_doc/CloudDesktop.md @@ -0,0 +1,64 @@ +# CloudDesktop简介 + +支持Web,RDP,SSH多种远程方式 + +## 一、WEB浏览器 + +- HTTP/HTTPS双协议 +- lite/full两种模式 +- 多实例支持(vnc_server) +- 与rdp桌面共享 +- 双密码：可操控+只读 + +![](res/08vnc-index2.png) + +## 二、RDP客户端 + +mstisc/mRemoteNG + +- 双屏显示 +- 远程声音 +- 双向剪切板(文本、文件) +- 本地磁盘挂载 + +![](res/01rdp-double-screen.png) + +## 三、多语言 + +```bash +# LOCALE +- pt_PT es_ES fr_FR de_DE ru_RU it_IT nl_NL cs_CZ tr_TR ar_EG +- zh_CN zh_HK zh_TW ko_KR ja_JP +# TZ 时区 +- Asia/Shanghai (default) +- Etc/GMT-8 #东八区 +``` + +![zh_CN](res/loc/zh_CN.png) + +## 四、桌面应用 + +- IBUS/Fcitx输入法(rime/sogou中文) +- Flameshot截图 +- PAC终端管理、oh-my-bash + +![](res/06full-flameshot.png) + +## 五、发行版选择 + +Debian9(LTS 5年已到期) > Ubuntu20.04(LTS 10年期) + +https://wiki.debian.org/LTS #deb9: (July 6, 2020 to June 30, 2022 ) +https://ubuntu.com/about/release-cycle #ubt20: (2020.4 - 2030.4) + +**1)Debian9** + +2017, xrdp 0.9.16_OpenSSL 1.1.0l 10 Sep 2019 |Xvnc TigerVNC 1.10.0 |pulseaudio 10.0 + +![](./../_doc/assets/lts_debian.png) + +**2)Ubuntu20.04** + +xrdp 0.9.16_OpenSSL 1.1.1f 31 Mar 2020 |Xvnc TigerVNC 1.12.0 |pulseaudio 13.99.1 + +![](./../_doc/assets/lts_ubuntu.png) diff --git a/_doc/mannual/b1-locale.md b/_doc/Locale.md similarity index 100% rename from _doc/mannual/b1-locale.md rename to _doc/Locale.md diff --git a/_doc/mannual/b0-todo.md b/_doc/TODO.md similarity index 99% rename from _doc/mannual/b0-todo.md rename to _doc/TODO.md index dd62e16..a457326 100644 --- a/_doc/mannual/b0-todo.md +++ b/_doc/TODO.md @@ -1,4 +1,4 @@ -# +# TODO - 接入: mRemoteNG, 浏览器, Xshell (mstsc: 双屏) - 音频: RDP, noVNC, `play xx.mp3` diff --git a/_doc/deploy/assets/bg-blue-linestar.jpg b/_doc/assets/bg/bg-blue-linestar.jpg similarity index 100% rename from _doc/deploy/assets/bg-blue-linestar.jpg rename to _doc/assets/bg/bg-blue-linestar.jpg diff --git a/_doc/deploy/assets/bg-debian-liteblue.png b/_doc/assets/bg/bg-debian-liteblue.png similarity index 100% rename from _doc/deploy/assets/bg-debian-liteblue.png rename to _doc/assets/bg/bg-debian-liteblue.png diff --git a/_doc/deploy/assets/bg-debian-litegrey.png b/_doc/assets/bg/bg-debian-litegrey.png similarity index 100% rename from _doc/deploy/assets/bg-debian-litegrey.png rename to _doc/assets/bg/bg-debian-litegrey.png diff --git a/_doc/deploy/assets/bg1.jpg b/_doc/assets/bg/bg1.jpg similarity index 100% rename from _doc/deploy/assets/bg1.jpg rename to _doc/assets/bg/bg1.jpg diff --git a/_doc/deploy/assets/pure-blue.jpg b/_doc/assets/bg/pure-blue.jpg similarity index 100% rename from _doc/deploy/assets/pure-blue.jpg rename to _doc/assets/bg/pure-blue.jpg diff --git a/_doc/deploy/assets/bunsen-papirus-icon-theme_10.3-2_all.deb b/_doc/assets/bunsen-papirus-icon-theme_10.3-2_all.deb similarity index 100% rename from _doc/deploy/assets/bunsen-papirus-icon-theme_10.3-2_all.deb rename to _doc/assets/bunsen-papirus-icon-theme_10.3-2_all.deb diff --git a/_doc/deploy/assets/flux/Squared_for_Debian.zip b/_doc/assets/flux/Squared_for_Debian.zip similarity index 100% rename from _doc/deploy/assets/flux/Squared_for_Debian.zip rename to _doc/assets/flux/Squared_for_Debian.zip diff --git a/_doc/deploy/assets/lts_debian.png b/_doc/assets/lts_debian.png similarity index 100% rename from _doc/deploy/assets/lts_debian.png rename to _doc/assets/lts_debian.png diff --git a/_doc/deploy/assets/lts_ubuntu.png b/_doc/assets/lts_ubuntu.png similarity index 100% rename from _doc/deploy/assets/lts_ubuntu.png rename to _doc/assets/lts_ubuntu.png diff --git a/_doc/deploy/assets/readme.txt b/_doc/assets/readme.txt similarity index 100% rename from _doc/deploy/assets/readme.txt rename to _doc/assets/readme.txt diff --git a/_doc/deploy/fat-docker/.env b/_doc/deploy/.env similarity index 100% rename from _doc/deploy/fat-docker/.env rename to _doc/deploy/.env diff --git a/_doc/deploy/README.md b/_doc/deploy/README.md deleted file mode 100644 index 18163a8..0000000 --- a/_doc/deploy/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# 生产部署指引 - -- [Windows虚拟机部署：](./win-vbox/README.md) 采用barge-os迷你容器系统, --network=host 采用虚机IP -- [服务器部署：](./fat-docker/README.md) 容器使用macvlan网络，分配专用IP，建议安装lxcfs -- [K8S内部署：](TODO/README.md) Deployment+Service diff --git a/_doc/deploy/fat-docker/docker-compose.yml b/_doc/deploy/docker-compose.yml similarity index 100% rename from _doc/deploy/fat-docker/docker-compose.yml rename to _doc/deploy/docker-compose.yml diff --git a/_doc/deploy/fat-docker/README.md b/_doc/deploy/fat-docker/README.md deleted file mode 100644 index 5445bef..0000000 --- a/_doc/deploy/fat-docker/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Linux服务器部署 - -- 1.环境准备：服务器安装docker, 可再安装lxcfs、使用XFS文件系统以让容器支持CPU/MEM/DISK层面的资源限定隔离（用于胖容器环境） -- 2.部署headless：采用docker-compose.yml做部署， docker采用macvlan网络，分配专用IP - -```bash -# net -docker network create -d macvlan --subnet=172.25.20.0/22 --gateway=172.25.23.254 -o parent=vmbr0 macvlan1 - -# test -docker run -it --rm --network=macvlan1 --ip=172.25.23.190 infrastlabs/alpine-ext - -# coker-compose编排： -# .env 设定容器主机名、IP、CPU/内存限定参数 -# docker-compose.yml 编排文件，礴lxcfs资源可视隔离(未装lxcfs请注释相关挂载路径) -docker-compose up #启动headless容器 -``` \ No newline at end of file diff --git a/_doc/deploy/k8s-headless/README.md b/_doc/deploy/k8s-headless/README.md deleted file mode 100644 index ce85155..0000000 --- a/_doc/deploy/k8s-headless/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Kubernetes环境部署 - - -**1.一条指令快速初始** (现有集群) - -```bash -kc apply -k https://gitee.com/infrastlabs/docker-headless//deploy/k8s-headless #初始指令 -kc -n default get po -w #跟进pod初始化进度 -``` - -(注: `kc` 为 `kubectl`的简写: `ln -s /usr/local/bin/kubectl kc`, `dcp`为`docker-compose`简写) - -**2.无集群快速体验：[初始k3s轻集群](k3s/README.md) > 执行上一步** - diff --git a/_doc/deploy/win-vbox/README.md b/_doc/deploy/win-vbox/README.md deleted file mode 100644 index ed9ee1c..0000000 --- a/_doc/deploy/win-vbox/README.md +++ /dev/null @@ -1,41 +0,0 @@ -# Windows虚拟机部署 - -Windows(或Esxi/pve虚拟化平台)，barge-os迷你容器系统, 采用虚机IP - -## 一、barge虚拟机配置 - -```bash -# step1.1: vbox设置， nat网卡共用宿主机IP, 配置端口转发: 10022>10022; 10081>10081; 10089>10089 (或选择桥接网卡，独立分配IP) -# step1.2: 下载barge-os.iso: https://github.com/bargees/barge-os/releases -# 13M barge_2.10.2.iso https://github.com/bargees/barge-os/releases/download/2.10.2/barge.iso #Docker v18.09.0-beta3 -# 14M barge-2.14.0-rc2.iso https://github.com/bargees/barge-os/releases/download/2.14.0-rc2/barge.iso -# 33M barge-x.iso https://github.com/bargees/barge-os/releases/download/2.12.0-x/barge-x.iso - -# step2: 进入系统后：fdisk /dev/sda -mkfs.ext4 -b 4096 -i 4096 -F -L BARGE-DATA /dev/sda1 #none: e2label /dev/xxx1 LABEL1 -mkswap -L BARGE-SWAP /dev/xxx -``` - -## 二、dbox容器配置 - -```bash -# 运行容器 -vols=""" --v /:/mnt --v /mnt/data/dbox_ext:/_ext --v /mnt/data/dbox_opt:/opt -""" -docker run -d --name=devbox --shm-size 1g \ ---privileged --restart=always --net=host $vols \ -infrastlabs/docker-headless:latest - -# 配置Dind访问 -# 宿主机：18.09.3? |docker-1.10.3 @barge -docker run -v /mnt/data/dbox_opt:/opt docker:1.10.3 sh -c "cp /usr/local/bin/docker /opt; ls -lh /opt" -docker run -v /opt:/opt docker:18.09.8 sh -c "cp /usr/local/bin/docker /opt; ls -lh /opt" #docker-18.09.8 - -# 容器内： -sudo ln -s /opt/docker /bin/ -sudo ln -s /mnt/var/run/docker.sock /var/run/docker.sock -sudo chmod 777 /var/run/docker.sock -``` diff --git a/_doc/mannual/01-CloudDesktop.md b/_doc/mannual/01-CloudDesktop.md deleted file mode 100644 index db0c5ab..0000000 --- a/_doc/mannual/01-CloudDesktop.md +++ /dev/null @@ -1,46 +0,0 @@ -# CloudDesktop - -支持SSH,RDP,WEB浏览器3种访问管理方式, 镜像有3个版本，tag标签最新为`box07`。 - -- [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/slim)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)`slim`  迷你版: ，fluxbox+stterm 只适合做vnc桌面网关 -- [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/latest)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)`latest`豪华版: , xfce+Audio **内置Qmmp音乐播放器** -- [![Docker Image Size](https://img.shields.io/docker/image-size/infrastlabs/docker-headless/full)](https://hub.docker.com/r/infrastlabs/docker-headless/tags)`full`   旗舰版: , **本土化**、**输入法**、**截屏软件**、**SSH软件** - -## 一、RDP客户端访问 - -- 双屏显示 -- 远程声音 -- 双向剪切板(文本、文件) -- 本地磁盘挂载 - -![](res/01rdp-double-screen.png) - -## 二、WEB浏览器远程访问 - -- HTTP/HTTPS双协议 -- lite/full两种模式 -- 多实例支持(vnc_server) -- 与rdp桌面共享 -- 双密码：可操控+只读 - -![](res/08vnc-index2.png) - -## 三、多语言本地化支持 - -- LOCALE 多语言 - - pt_PT es_ES fr_FR de_DE ru_RU it_IT nl_NL cs_CZ tr_TR ar_EG - - zh_CN zh_HK zh_TW ko_KR ja_JP -- TZ 时区设置 - - Asia/Shanghai (default) - - Etc/GMT-8 #东八区 - -![zh_CN](res/loc/zh_CN.png) - -## 四、远程桌面应用 - -- IBUS输入法(rime中文) -- Flameshot截图软件 -- PAC终端管理器、oh-my-bash增强 - -![](res/06full-flameshot.png) - diff --git a/_doc/mannual/README.md b/_doc/mannual/README.md deleted file mode 100644 index ef834cf..0000000 --- a/_doc/mannual/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Usage - -- [CloudDesktop](01-CloudDesktop.md) RDP/WEB Locale 桌面应用 -- -- [b0-locale.md](b1-locale.md) 设置中文或其它语言 -- [b1-rdp.md](b2-rdp.md) 双屏连接，远程剪切板、音频使用 -- [b2-vnc.md](b3-vnc.md) WEB访问远程桌面 -- [b3-apps.md](b4-apps.md) 中文输入法、截图软件使用说明 -- [b5-audio.md](b5-audio.md) 音乐播放器及远程音频相关说明 -- [b6-desktop.md](b6-desktop.md) 使用Uubuntu, Mate等其它桌面 diff --git a/_doc/mannual/b2-rdp.md b/_doc/mannual/b2-rdp.md deleted file mode 100644 index fc90cec..0000000 --- a/_doc/mannual/b2-rdp.md +++ /dev/null @@ -1,30 +0,0 @@ -# RDP客户端连接 - -## 一、双屏连接 - -目前：windows自带的mstsc连接器支持双屏， mRemoteNG不支持 - -![](res/01rdp-doubleScreenConn.png) - -## 二、磁盘映射 - -![](res/02rdp-diskMount.png) - -![](res/02rdp-diskMount-view.png) - -## 三、剪切板 - -支持剪切板及文件拷贝 - -![](res/03rdp-clipboard-text.png) - -![](res/03rdp-clipboardFileCopy.png) - -## 四、RDP音频 - -windows下的效果不错， Linux下客户端效果差一点(Remmina) - -![](res/04rdp-audio.png) - - - diff --git a/_doc/mannual/b3-vnc.md b/_doc/mannual/b3-vnc.md deleted file mode 100644 index f72ef9e..0000000 --- a/_doc/mannual/b3-vnc.md +++ /dev/null @@ -1,20 +0,0 @@ -# WEB访问远程桌面 - -入口地址：http://192.168.0.x:10081， https://192.168.0.x:10081 (HTTPS默认每次启动时更换SSL证书， 可通过VNC_CERT指定证书) - -- 支持HTTP/HTTPS双协议访问 -- lite/full两种面板模式 -- 密码/只读密码两种交互模式（只读密码 可用于远程教学的屏幕分享） -- 带vnc转发网关功能，支持Xserver多开的访问。 - -**lite模式** - -![](res/09vnc-lite.png) - -**full模式** 本地全屏、远程调分辨率、图像质量调节 - -![](res/10vnc-full.png) - -**多个屏幕访问** 启多个vnc_server - -环境变量：VNC_OFFSET=0设定5900的偏移量，VNC_LIMIT=1设定开启VNC服务的个数（默认第1个用于本地桌面环境） diff --git a/_doc/mannual/b4-apps.md b/_doc/mannual/b4-apps.md deleted file mode 100644 index d99296a..0000000 --- a/_doc/mannual/b4-apps.md +++ /dev/null @@ -1,20 +0,0 @@ -# 远程桌面应用 - -## 一、IBUS中文输入法 - -点击状态样图标，再点击部署，即可输入中文 - -![](res/05full-ibusRime.png) - -## 二、Flameshot截图软件 - -快捷键(alt+q)激活区域截图, 或点击状态栏图标截图，选好区域后:右键切换画笔颜色、滚轮改变画笔大小 - -![](res/06full-flameshot.png) - -## 三、PAC 远程SSH软件 - -集中管理远程ssh连接， 类似windows下的XShell - -![](res/07full-pac,ohmybash2.png) - diff --git a/_doc/mannual/b5-audio.md b/_doc/mannual/b5-audio.md deleted file mode 100644 index 852aba8..0000000 --- a/_doc/mannual/b5-audio.md +++ /dev/null @@ -1,14 +0,0 @@ -# - -## Qmmp音乐播放器 - -- ling-13400-lstQmmp.sh 获取网上mp3铃声列表，导入Qmmp中播放 - -## noVnc-audio - -```bash -# 22.2.21: DO -use broadcasts-server pulse > ffmpeg > curl > broadcasts-server > client(howlerjs/bc\'s webMainPage) - -# 已完成port: 10082； doc: TODO -``` \ No newline at end of file diff --git a/_doc/mannual/b6-desktop.md b/_doc/mannual/b6-desktop.md deleted file mode 100644 index 529f078..0000000 --- a/_doc/mannual/b6-desktop.md +++ /dev/null @@ -1,14 +0,0 @@ -# 使用Ubuntu, Mate，KDE等其它桌面 - -**multi-desktop** (X11图像网关+pulse音频网关) - -[docker-compose.yml (Fluxbox,Mate,Xfce,KDE)](../DE/docker-compose.yml) - -![](./res/design-MultiBox.png) - -**桌面截图** - -- de1-fluxbox@deb9(slim网关自带) ![](./res/de/de1-fluxbox@deb9.png) -- de2-mate@deb11(三方,英文) ![](./res/de/de2-mate@deb11.png) -- de3-xfce@deb11(本地化) ![](./res/de/de3-xfce@deb11.png) -- de4-kde@ubt1804(三方,英文) ![](./res/de/de4-kde@ubt1804.png) diff --git a/_doc/mannual/res/08vnc-index2.png b/_doc/mannual/res/08vnc-index2.png deleted file mode 100644 index d25868d..0000000 Binary files a/_doc/mannual/res/08vnc-index2.png and /dev/null differ diff --git a/_doc/mannual/t1.md b/_doc/mannual/t1.md deleted file mode 100644 index ab0f475..0000000 --- a/_doc/mannual/t1.md +++ /dev/null @@ -1,47 +0,0 @@ -# Extend - -**vncpasswd** - -```bash -# 格式：RW|RO 一组； -# 动态：即时生成，连接时调用； -# :~/.vnc# -apt.sh tigervnc-common #66.6 kB -echo -e "123456a\n123456a\ny\n345678\n345678" |vncpasswd vnc_pass2 - -# Xvnc: -BlacklistThreshold=3 -BlacklistTimeout=1 -# xrdp-disk-mount: --privileged; or: moprobe fuse err. -``` - -**Locale/Theme** - -- fonts,themes,icons: `fonts-wqy-zenhei gnome-icon-theme ttf/fonts*` -- apps: `mpv firefox-esr chromium-broswer` -- papirus-icon-theme xubuntu-icon-theme faenza-icon-theme pocillo-icon-theme, greybird-gtk-theme - -**Usage** - -```bash -# conn -# sam @ debian11 in ~ |00:54:38 -$ rdesktop 172.17.0.21:10089 -uheadless -pheadless -a 15 -g 1600x1010 - - -``` - - -**Refs** - -- xubuntu - - https://github.com/accetto/xubuntu-vnc-novnc #276.52 MB - - https://github.com/hectorm/docker-xubuntu #633.29 MB -- distros - - peppermint: https://peppermintos.com/guide/downloading/ - - dtx2 https://github.com/gfk-sysenv/dxt2 https://dxt2.co.za - - LXLE: https://sourceforge.net/projects/lxle/ #greybird; -compact -- headless - - https://github.com/ConSol/docker-headless-vnc-container - - https://github.com/jlesage/docker-firefox - - https://hub.fastgit.org/aerokube/selenoid -- https://github.com/fadams/docker-gui https://gitee.com/g-system/docker-gui #pdf -- https://github.com/frxyt/docker-xrdp #DE diff --git a/_doc/mannual/res/01rdp-double-screen.png b/_doc/res/01rdp-double-screen.png similarity index 100% rename from _doc/mannual/res/01rdp-double-screen.png rename to _doc/res/01rdp-double-screen.png diff --git a/_doc/mannual/res/01rdp-doubleScreenConn.png b/_doc/res/01rdp-doubleScreenConn.png similarity index 100% rename from _doc/mannual/res/01rdp-doubleScreenConn.png rename to _doc/res/01rdp-doubleScreenConn.png diff --git a/_doc/mannual/res/02/apps-browsers.jpg b/_doc/res/02/apps-browsers.jpg similarity index 100% rename from _doc/mannual/res/02/apps-browsers.jpg rename to _doc/res/02/apps-browsers.jpg diff --git a/_doc/mannual/res/02/apps-office-wps.jpg b/_doc/res/02/apps-office-wps.jpg similarity index 100% rename from _doc/mannual/res/02/apps-office-wps.jpg rename to _doc/res/02/apps-office-wps.jpg diff --git a/_doc/mannual/res/02/dind1-hostDown.png b/_doc/res/02/dind1-hostDown.png similarity index 100% rename from _doc/mannual/res/02/dind1-hostDown.png rename to _doc/res/02/dind1-hostDown.png diff --git a/_doc/mannual/res/02/dind2-headlessLinks.png b/_doc/res/02/dind2-headlessLinks.png similarity index 100% rename from _doc/mannual/res/02/dind2-headlessLinks.png rename to _doc/res/02/dind2-headlessLinks.png diff --git a/_doc/mannual/res/02/ide1-idea.png b/_doc/res/02/ide1-idea.png similarity index 100% rename from _doc/mannual/res/02/ide1-idea.png rename to _doc/res/02/ide1-idea.png diff --git a/_doc/mannual/res/02/ide2-vscode.png b/_doc/res/02/ide2-vscode.png similarity index 100% rename from _doc/mannual/res/02/ide2-vscode.png rename to _doc/res/02/ide2-vscode.png diff --git a/_doc/mannual/res/02/x11-gw-fluxbox.png b/_doc/res/02/x11-gw-fluxbox.png similarity index 100% rename from _doc/mannual/res/02/x11-gw-fluxbox.png rename to _doc/res/02/x11-gw-fluxbox.png diff --git a/_doc/mannual/res/02rdp-diskMount-view.png b/_doc/res/02rdp-diskMount-view.png similarity index 100% rename from _doc/mannual/res/02rdp-diskMount-view.png rename to _doc/res/02rdp-diskMount-view.png diff --git a/_doc/mannual/res/02rdp-diskMount.png b/_doc/res/02rdp-diskMount.png similarity index 100% rename from _doc/mannual/res/02rdp-diskMount.png rename to _doc/res/02rdp-diskMount.png diff --git a/_doc/mannual/res/03rdp-clipboard-text.png b/_doc/res/03rdp-clipboard-text.png similarity index 100% rename from _doc/mannual/res/03rdp-clipboard-text.png rename to _doc/res/03rdp-clipboard-text.png diff --git a/_doc/mannual/res/03rdp-clipboardFileCopy.png b/_doc/res/03rdp-clipboardFileCopy.png similarity index 100% rename from _doc/mannual/res/03rdp-clipboardFileCopy.png rename to _doc/res/03rdp-clipboardFileCopy.png diff --git a/_doc/mannual/res/04rdp-audio.png b/_doc/res/04rdp-audio.png similarity index 100% rename from _doc/mannual/res/04rdp-audio.png rename to _doc/res/04rdp-audio.png diff --git a/_doc/mannual/res/05full-ibusRime.png b/_doc/res/05full-ibusRime.png similarity index 100% rename from _doc/mannual/res/05full-ibusRime.png rename to _doc/res/05full-ibusRime.png diff --git a/_doc/mannual/res/06full-flameshot.png b/_doc/res/06full-flameshot.png similarity index 100% rename from _doc/mannual/res/06full-flameshot.png rename to _doc/res/06full-flameshot.png diff --git a/_doc/mannual/res/07full-pac,ohmybash2.png b/_doc/res/07full-pac,ohmybash2.png similarity index 100% rename from _doc/mannual/res/07full-pac,ohmybash2.png rename to _doc/res/07full-pac,ohmybash2.png diff --git a/_doc/res/08vnc-index2.png b/_doc/res/08vnc-index2.png new file mode 100644 index 0000000..6441169 Binary files /dev/null and b/_doc/res/08vnc-index2.png differ diff --git a/_doc/mannual/res/09vnc-lite.png b/_doc/res/09vnc-lite.png similarity index 100% rename from _doc/mannual/res/09vnc-lite.png rename to _doc/res/09vnc-lite.png diff --git a/_doc/mannual/res/10vnc-full.png b/_doc/res/10vnc-full.png similarity index 100% rename from _doc/mannual/res/10vnc-full.png rename to _doc/res/10vnc-full.png diff --git a/_doc/mannual/res/de/de1-fluxbox@deb9.png b/_doc/res/de/de1-fluxbox@deb9.png similarity index 100% rename from _doc/mannual/res/de/de1-fluxbox@deb9.png rename to _doc/res/de/de1-fluxbox@deb9.png diff --git a/_doc/mannual/res/de/de2-mate@deb11.png b/_doc/res/de/de2-mate@deb11.png similarity index 100% rename from _doc/mannual/res/de/de2-mate@deb11.png rename to _doc/res/de/de2-mate@deb11.png diff --git a/_doc/mannual/res/de/de3-xfce@deb11.png b/_doc/res/de/de3-xfce@deb11.png similarity index 100% rename from _doc/mannual/res/de/de3-xfce@deb11.png rename to _doc/res/de/de3-xfce@deb11.png diff --git a/_doc/mannual/res/de/de4-kde@ubt1804.png b/_doc/res/de/de4-kde@ubt1804.png similarity index 100% rename from _doc/mannual/res/de/de4-kde@ubt1804.png rename to _doc/res/de/de4-kde@ubt1804.png diff --git a/_doc/mannual/res/design-MultiBox.png b/_doc/res/design-MultiBox.png similarity index 100% rename from _doc/mannual/res/design-MultiBox.png rename to _doc/res/design-MultiBox.png diff --git a/_doc/mannual/res/design/RDesktop.png b/_doc/res/design/RDesktop.png similarity index 100% rename from _doc/mannual/res/design/RDesktop.png rename to _doc/res/design/RDesktop.png diff --git a/_doc/mannual/res/design/RDesktop_IMAGE.png b/_doc/res/design/RDesktop_IMAGE.png similarity index 100% rename from _doc/mannual/res/design/RDesktop_IMAGE.png rename to _doc/res/design/RDesktop_IMAGE.png diff --git a/_doc/mannual/res/loc/10cs_CZ.png b/_doc/res/loc/10cs_CZ.png similarity index 100% rename from _doc/mannual/res/loc/10cs_CZ.png rename to _doc/res/loc/10cs_CZ.png diff --git a/_doc/mannual/res/loc/11tr_TR.png b/_doc/res/loc/11tr_TR.png similarity index 100% rename from _doc/mannual/res/loc/11tr_TR.png rename to _doc/res/loc/11tr_TR.png diff --git a/_doc/mannual/res/loc/12ar_SA.png b/_doc/res/loc/12ar_SA.png similarity index 100% rename from _doc/mannual/res/loc/12ar_SA.png rename to _doc/res/loc/12ar_SA.png diff --git a/_doc/mannual/res/loc/1pt_PT.png b/_doc/res/loc/1pt_PT.png similarity index 100% rename from _doc/mannual/res/loc/1pt_PT.png rename to _doc/res/loc/1pt_PT.png diff --git a/_doc/mannual/res/loc/2es_ES.png b/_doc/res/loc/2es_ES.png similarity index 100% rename from _doc/mannual/res/loc/2es_ES.png rename to _doc/res/loc/2es_ES.png diff --git a/_doc/mannual/res/loc/3fr_FR.png b/_doc/res/loc/3fr_FR.png similarity index 100% rename from _doc/mannual/res/loc/3fr_FR.png rename to _doc/res/loc/3fr_FR.png diff --git a/_doc/mannual/res/loc/4de_DE.png b/_doc/res/loc/4de_DE.png similarity index 100% rename from _doc/mannual/res/loc/4de_DE.png rename to _doc/res/loc/4de_DE.png diff --git a/_doc/mannual/res/loc/5ru_RU.png b/_doc/res/loc/5ru_RU.png similarity index 100% rename from _doc/mannual/res/loc/5ru_RU.png rename to _doc/res/loc/5ru_RU.png diff --git a/_doc/mannual/res/loc/6it_IT.png b/_doc/res/loc/6it_IT.png similarity index 100% rename from _doc/mannual/res/loc/6it_IT.png rename to _doc/res/loc/6it_IT.png diff --git a/_doc/mannual/res/loc/7ko_KR.png b/_doc/res/loc/7ko_KR.png similarity index 100% rename from _doc/mannual/res/loc/7ko_KR.png rename to _doc/res/loc/7ko_KR.png diff --git a/_doc/mannual/res/loc/8ja_JP.png b/_doc/res/loc/8ja_JP.png similarity index 100% rename from _doc/mannual/res/loc/8ja_JP.png rename to _doc/res/loc/8ja_JP.png diff --git a/_doc/mannual/res/loc/9nl_NL.png b/_doc/res/loc/9nl_NL.png similarity index 100% rename from _doc/mannual/res/loc/9nl_NL.png rename to _doc/res/loc/9nl_NL.png diff --git a/_doc/mannual/res/loc/lang_pers_cnt2.jpg b/_doc/res/loc/lang_pers_cnt2.jpg similarity index 100% rename from _doc/mannual/res/loc/lang_pers_cnt2.jpg rename to _doc/res/loc/lang_pers_cnt2.jpg diff --git a/_doc/mannual/res/loc/zh_CN.png b/_doc/res/loc/zh_CN.png similarity index 100% rename from _doc/mannual/res/loc/zh_CN.png rename to _doc/res/loc/zh_CN.png diff --git a/_doc/mannual/res/loc/zh_HK.png b/_doc/res/loc/zh_HK.png similarity index 100% rename from _doc/mannual/res/loc/zh_HK.png rename to _doc/res/loc/zh_HK.png diff --git a/_doc/mannual/res/loc/zh_TW.png b/_doc/res/loc/zh_TW.png similarity index 100% rename from _doc/mannual/res/loc/zh_TW.png rename to _doc/res/loc/zh_TW.png diff --git a/_doc/res/scenenary-hw1.png b/_doc/res/scenenary-hw1.png new file mode 100644 index 0000000..7fc6d71 Binary files /dev/null and b/_doc/res/scenenary-hw1.png differ diff --git a/_doc/res/scenenary-hw2.png b/_doc/res/scenenary-hw2.png new file mode 100644 index 0000000..88a3200 Binary files /dev/null and b/_doc/res/scenenary-hw2.png differ diff --git "a/_doc/\344\275\277\347\224\250\346\211\213\345\206\214.md" "b/_doc/\344\275\277\347\224\250\346\211\213\345\206\214.md" new file mode 100644 index 0000000..20ff954 --- /dev/null +++ "b/_doc/\344\275\277\347\224\250\346\211\213\345\206\214.md" @@ -0,0 +1,102 @@ +# 使用手册 + +## 一、WEB访问远程桌面 + +入口地址：http://192.168.0.x:10081， https://192.168.0.x:10081 (HTTPS默认每次启动时更换SSL证书， 可通过VNC_CERT指定证书) + +- 支持HTTP/HTTPS双协议访问 +- lite/full两种面板模式 +- 密码/只读密码两种交互模式（只读密码 可用于远程教学的屏幕分享） +- 带vnc转发网关功能，支持Xserver多开的访问。 + +**lite模式** + +![](res/09vnc-lite.png) + +**full模式** 本地全屏、远程调分辨率、图像质量调节 + +![](res/10vnc-full.png) + +**多个屏幕访问** 启多个vnc_server + +环境变量：VNC_OFFSET=0设定5900的偏移量，VNC_LIMIT=1设定开启VNC服务的个数（默认第1个用于本地桌面环境） + +## 二、RDP客户端连接 + +双屏连接，远程剪切板、音频使用 + +**1)双屏连接** + +目前：windows自带的mstsc连接器支持双屏， mRemoteNG不支持 + +![](res/01rdp-doubleScreenConn.png) + +**2)磁盘映射** + +![](res/02rdp-diskMount.png) + +![](res/02rdp-diskMount-view.png) + +**3)剪切板** + +支持剪切板及文件拷贝 + +![](res/03rdp-clipboard-text.png) + +![](res/03rdp-clipboardFileCopy.png) + +**4)RDP音频** + +windows下的效果不错， Linux下客户端效果差一点(Remmina) + +![](res/04rdp-audio.png) + + +## 三、使用Mate, Gnome, KDE等桌面 + +- de2-mate@deb11(三方,英文) ![](./res/de/de2-mate@deb11.png) +- de3-xfce@deb11(本地化) ![](./res/de/de3-xfce@deb11.png) +- de4-kde@ubt1804(三方,英文) ![](./res/de/de4-kde@ubt1804.png) + + +## 四、远程音频 + +音乐播放器及远程音频相关说明 + +**1)Qmmp音乐播放器** + +- ling-13400-lstQmmp.sh 获取网上mp3铃声列表，导入Qmmp中播放 + +**2)noVnc-audio** + +```bash +# 22.2.21: DO +use broadcasts-server pulse > ffmpeg > curl > broadcasts-server > client(howlerjs/bc\'s webMainPage) + +# 已完成port: 10082； doc: TODO +``` + +## 五、远程桌面应用 + +中文输入法、截图软件使用说明 + +RDP/WEB Locale 桌面应用 + +**1)IBUS中文输入法** + +点击状态样图标，再点击部署，即可输入中文。注：ubuntu2004新版已自动部署 + +![](res/05full-ibusRime.png) + +**2)Flameshot截图软件** + +快捷键(alt+q)激活区域截图, 或点击状态栏图标截图，选好区域后:右键切换画笔颜色、滚轮改变画笔大小 + +![](res/06full-flameshot.png) + +**3)PAC 远程SSH软件** + +集中管理远程ssh连接， 类似windows下的XShell + +![](res/07full-pac,ohmybash2.png) + diff --git "a/_doc/\345\234\272\346\231\257\345\210\206\346\236\220\344\270\216\345\273\272\350\256\256.md" "b/_doc/\345\234\272\346\231\257\345\210\206\346\236\220\344\270\216\345\273\272\350\256\256.md" deleted file mode 100644 index 5c4cd7e..0000000 --- "a/_doc/\345\234\272\346\231\257\345\210\206\346\236\220\344\270\216\345\273\272\350\256\256.md" +++ /dev/null @@ -1,32 +0,0 @@ -# 场景分析与建议 - -## 一、适用场景 - -参考：初识云桌面[华为云桌面] https://support.huaweicloud.com/ugeu-workspace/workspace_02_0001.html - -- 工作站：多点操作，同一桌面；长期运行，不怕断电，无需重启 -- 轻终端：轻薄笔记本，迷你主机；CPU不行，内存不够，磁盘不足 -- 局域网：推荐mRemoteNG/RDP+SSH模式（本地网延迟小，音频效果好） -- 跨公网：推荐noVNC+SSH模式（直接浏览器则方便 还带只读模式，或RDP调整为8位图 适合长时远程工作） - -## 二、使用建议 - -RDP: 双屏需使用windows自带的mstsc.exe，高分屏(放大显示)请用mRemoteNG -SSH: 推荐XShell之类客户端， 支持rz/sz快速送文件 -noVNC: 提供只读模式(密码区分)，支持音频 - -**版本选用** - -- 定制版[Xfce4+tint2+plank] 默认Supervisor模式 - - deb9: v1系列（轻巧: IBUS-Rime输入法，已完善稳定） - - mint: v2系列（通用: Fcitx-Sogou输入法，完善中..） -- 通用版[多桌面] 默认systemd模式 - - Gnome: 必须systemd模式启动 - - Plasma: 需privileged模式，不支持Cent7下运行 - - Cinnamon: 基于Mint, 无裁剪，欢迎页，有屏保锁屏 - - Mate: 基于Mint, 无裁剪，欢迎页，有屏保锁屏 - - Xfce: 基于Mint, 清理Icon资源，集成Docky(完善中..) - -## 三、常见问题 - - diff --git "a/_doc/\347\224\237\344\272\247\351\203\250\347\275\262\346\214\207\345\274\225.md" "b/_doc/\347\224\237\344\272\247\351\203\250\347\275\262\346\214\207\345\274\225.md" new file mode 100644 index 0000000..9688348 --- /dev/null +++ "b/_doc/\347\224\237\344\272\247\351\203\250\347\275\262\346\214\207\345\274\225.md" @@ -0,0 +1,83 @@ +# 生产部署指引 + +## 一、Windows虚拟机部署 + +Windows-Vbox虚拟机(或Esxi/pve虚拟化)+ Barge-OS迷你容器系统, `--network=host`采用虚机IP + +`14M`的ISO镜像(内置Docker): https://github.com/bargees/barge-os/releases/download/2.14.0-rc2/barge.iso + +**1)barge虚拟机配置** + +```bash +# step1: vbox设置， nat网卡共用宿主机IP, 配置端口转发: 10022>10022; 10081>10081; 10089>10089 (或选择桥接网卡，独立分配IP) + +#下载barge-os.iso: https://github.com/bargees/barge-os/releases +# 13M barge_2.10.2.iso https://github.com/bargees/barge-os/releases/download/2.10.2/barge.iso #Docker v18.09.0-beta3 +# 14M barge-2.14.0-rc2.iso https://github.com/bargees/barge-os/releases/download/2.14.0-rc2/barge.iso +# 33M barge-x.iso https://github.com/bargees/barge-os/releases/download/2.12.0-x/barge-x.iso + +# step2: 进入系统后：fdisk /dev/sda +mkfs.ext4 -b 4096 -i 4096 -F -L BARGE-DATA /dev/sda1 #none: e2label /dev/xxx1 LABEL1 +mkswap -L BARGE-SWAP /dev/xxx +``` + +**2)dbox容器配置** + +```bash +# 运行容器 +vols=""" +-v /:/mnt +-v /mnt/data/dbox_ext:/_ext +-v /mnt/data/dbox_opt:/opt +""" +docker run -d --name=devbox --shm-size 1g \ +--privileged --restart=always --net=host $vols \ +infrastlabs/docker-headless:latest + +# 配置Dind访问 +# 宿主机：18.09.3? |docker-1.10.3 @barge +docker run -v /mnt/data/dbox_opt:/opt docker:1.10.3 sh -c "cp /usr/local/bin/docker /opt; ls -lh /opt" +docker run -v /opt:/opt docker:18.09.8 sh -c "cp /usr/local/bin/docker /opt; ls -lh /opt" #docker-18.09.8 + +# 容器内： +sudo ln -s /opt/docker /bin/ +sudo ln -s /mnt/var/run/docker.sock /var/run/docker.sock +sudo chmod 777 /var/run/docker.sock +``` + +## 二、Linux服务器部署 + +容器使用macvlan网络，分配专用IP，建议安装lxcfs + +- 1.环境准备：服务器安装docker, 可再安装lxcfs、使用XFS文件系统以让容器支持CPU/MEM/DISK层面的资源限定隔离（用于胖容器环境） +- 2.部署headless：采用docker-compose.yml做部署， docker采用macvlan网络，分配专用IP + +```bash +# net +docker network create -d macvlan --subnet=172.25.20.0/22 --gateway=172.25.23.254 -o parent=vmbr0 macvlan1 + +# test +docker run -it --rm --network=macvlan1 --ip=172.25.23.190 infrastlabs/alpine-ext + +# coker-compose编排： +# .env 设定容器主机名、IP、CPU/内存限定参数 +# docker-compose.yml 编排文件，礴lxcfs资源可视隔离(未装lxcfs请注释相关挂载路径) +docker-compose up #启动headless容器 +``` + +## 三、Kubernetes环境部署 + +Deployment+Service + +**1.一条指令快速初始** (现有集群) + +```bash +kc apply -k https://gitee.com/infrastlabs/docker-headless//deploy/k8s-headless #初始指令 +kc -n default get po -w #跟进pod初始化进度 +``` + +(注: `kc` 为 `kubectl`的简写: `ln -s /usr/local/bin/kubectl kc`, `dcp`为`docker-compose`简写) + +**2.无集群快速体验：[初始k3s轻集群](k3s/README.md) > 执行上一步** + + diff --git "a/_doc/\351\200\202\347\224\250\345\234\272\346\231\257\344\270\216\351\227\256\351\242\230.md" "b/_doc/\351\200\202\347\224\250\345\234\272\346\231\257\344\270\216\351\227\256\351\242\230.md" new file mode 100644 index 0000000..f9f01a2 --- /dev/null +++ "b/_doc/\351\200\202\347\224\250\345\234\272\346\231\257\344\270\216\351\227\256\351\242\230.md" @@ -0,0 +1,103 @@ +# 适用场景与问题 + +## 一、适用场景 + +参考：初识云桌面[华为云桌面] https://support.huaweicloud.com/ugeu-workspace/workspace_02_0001.html + +**1)场景** + +- 工作站：多点操作，同一桌面；长期运行，不怕断电，无需重启 +- 轻终端：轻薄笔记本，迷你主机；CPU不行，内存不够，磁盘不足 +- 局域网：推荐`mRemoteNG/RDP+SSH`模式（本地网延迟小，音频效果好） +- 跨公网：推荐`noVNC+SSH`模式（直接浏览器则方便 还带只读模式，或RDP调整为8位图 适合长时远程工作） + +![](res/scenenary-hw1.png) + +**2)客户端选用** + +RDP: 双屏需使用windows自带的mstsc.exe，高分屏(放大显示)请用mRemoteNG +SSH: 推荐XShell之类客户端， 支持rz/sz快速送文件 +noVNC: 提供只读模式(密码区分)，支持音频 + +**3)版本选用** + +- 定制版[Xfce4+tint2+plank] 默认`Supervisor`模式 + - latest: Ubuntu20.04, Ibus-Rime输入法, LTS10年支持期 + - sogou: Ubuntu20.04, Fcitx-Sogou输入法, LTS10年支持期 + - core: Ubuntu20.04, gparted工具 Firefox, LTS10年支持期 + - debian9:[full,slim,deb9] 旧版（轻巧: IBUS-Rime输入法，已完善稳定） +- LiveCD[多桌面] 默认`Systemd`模式 + - Mate: 基于Mint, 无裁剪，欢迎页，有屏保锁屏 + - Xfce: 基于Mint, 清理Icon资源，集成Docky(完善中..) + - Cinnamon: 基于Mint, 无裁剪，欢迎页，有屏保锁屏 + - Gnome: 必须systemd模式启动 + - Plasma: 需privileged模式，不支持Cent7下运行 + +## 二、常见问题 + +**1)RDP本地磁盘映射** + +请指定 `--privileged` + +**2)WPS支持中文输入法** + +```bash +# 支持中文输入法 +sudo sed -i "1a export XMODIFIERS=@im=ibus" /usr/bin/{wps,wpp,et} +sudo sed -i "2a export QT_IM_MODULE=ibus" /usr/bin/{wps,wpp,et} +``` + +**3)ibus/fcitx全局生效** + +```bash +sed -i "s/ibus/fcitx/g" /etc/profile; +``` + +**4)密码修改** + +```bash +SSH_PASS=ChangeMe VNC_PASS=ChangeMe2 VNC_PASS_RO=ChangeMe3 +echo "headless:$SSH_PASS" |sudo chpasswd +echo -e "$VNC_PASS\n$VNC_PASS\ny\n$VNC_PASS_RO\n$VNC_PASS_RO" |sudo vncpasswd /etc/xrdp/vnc_pass; sudo chmod 644 /etc/xrdp/vnc_pass +``` + +**5)多语言支持** + +指定环境变量 -e L=zh_CN + +```bash +# 支持语言列表： +LOCALE_INCLUDE="zh_CN zh_HK zh_TW en en_CA es es_AR fr fr_CA pt pt_BR ar cs de it ja ko nl ru tr vi" +# zh_CN zh_HK zh_TW +en en_CA es es_AR pt pt_BR fr fr_CA +ar cs de it ja ko nl ru tr vi + + +# L=zh_CN; L=zh_HK; L=zh_TW; 中文 +L=pt_PT 葡萄牙 +L=es_ES 西班牙语(西班牙) +L=fr_FR 法 +L=de_DE 德 +L=ru_RU 俄 +L=it_IT 意 +L=ko_KR 韩 +L=ja_JP 日 +L=nl_NL 荷兰语(荷兰) +L=cs_CZ 捷克语(捷克共和国) +# https://blog.csdn.net/shenenhua/article/details/79150053 +L=tr_TR 土耳其语 -土耳其 +L=ar_EG 阿拉伯语 -埃及 +L=vi_VN 越南 -越南 +``` + +**6)Locale/Theme** + +- fonts,themes,icons: `fonts-wqy-zenhei gnome-icon-theme ttf/fonts*` +- apps: `mpv firefox-esr chromium-broswer` +- papirus-icon-theme xubuntu-icon-theme faenza-icon-theme pocillo-icon-theme, greybird-gtk-theme + +**7)Linux下远程桌面** + +```bash +$ rdesktop 172.17.0.21:10089 -uheadless -pheadless -a 15 -g 1600x1010 +``` diff --git a/docker-compose-livecd.yml b/docker-compose-livecd.yml index 784f417..6341773 100644 --- a/docker-compose-livecd.yml +++ b/docker-compose-livecd.yml @@ -87,7 +87,7 @@ services: - /:/mnt plasma: - image: infrastlabs/docker-headless:plas + image: infrastlabs/docker-headless:plasma restart: unless-stopped shm_size: 1g privileged: true diff --git a/ubt-core/README.md b/ubt-core/README.md index 9af8bb6..0137e05 100644 --- a/ubt-core/README.md +++ b/ubt-core/README.md @@ -1,7 +1,7 @@ # ubt - 镜像: 包含x86_64, arm64两个体系的镜像 -- 版本: 分为标准版，slim版(不含3D显卡，输入法，Flameshot, Git) +- 版本: 标准版，slim版(不含3D显卡，输入法，Flameshot, Git) - 集成systemd(2M), 以仿真实际Linux桌面发行版 - 基础能力 - tigervnc @@ -9,25 +9,6 @@ - webhookd, noVNC - misc, 多语言，显卡/输入法，常用软件 -```bash -docker run -it --rm -p 11081:10081 -p 11089:10089 \ - infrastlabs/docker-headless:core-v4-slim /entry.sh - -# systemd -docker run -it --rm -p 11081:10081 -p 11089:10089 \ - --tmpfs /run --tmpfs /run/lock --tmpfs /tmp --privileged \ - -v /_ext:/_ext -v /sys/fs/cgroup:/sys/fs/cgroup \ - infrastlabs/docker-headless:core-v4-slim -``` - -**TODO** - -- entry.sh - - ~~x10-de.conf 自动生成~~ - - ~~setsysenv_drop, grep -v _PASS$~~ - - ~~START_SESSION~~ -- 特点脑图: 无头模式,本地化,核心能力,层缓存,约定/配置项,用例分享 - **arm64** ```bash diff --git a/ubt-core/src/Dockerfile b/ubt-core/src/Dockerfile index 4fe96a8..322e273 100644 --- a/ubt-core/src/Dockerfile +++ b/ubt-core/src/Dockerfile @@ -57,7 +57,7 @@ RUN apt.sh \ language-pack-gnome-zh-hans papirus-icon-theme greybird-gtk-theme; \ rm -f /usr/share/backgrounds/greybird.svg; \ \ - wget https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/bunsen-papirus-icon-theme_10.3-2_all.deb; \ + wget https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bunsen-papirus-icon-theme_10.3-2_all.deb; \ dpkg -i bunsen-papirus-icon-theme_10.3-2_all.deb; rm -f bunsen-papirus-icon-theme_10.3-2_all.deb; \ cd /usr/share/icons && rm -rf Papirus-Bunsen-Dark-bluegrey Papirus-Bunsen-Dark-grey Papirus-Dark Papirus-Light ePapirus; \ \ diff --git a/ubt-core/src/bin/sethotkey b/ubt-core/src/bin/sethotkey index 8cf03b9..391ff23 100644 --- a/ubt-core/src/bin/sethotkey +++ b/ubt-core/src/bin/sethotkey @@ -1,17 +1,49 @@ #!/bin/sh - +key=$1 # leftAlt> leftCtl -# flux -oKey="^Alt " -nKey="Control " + +# FLUX +test "c" == "$key" && oKey="^Alt " || oKey="Control " +test "c" == "$key" && nKey="Control " || nKey="^Alt " file=~/.fluxbox/keys test -s $file && sed -i "s/$oKey/$nKey/g" $file +test -s $file && cat $file |grep "$nKey" +# reload flux +# test -z "`ps -ef |grep fluxbox`" || fluxbox reconfig + -# xfce -oKey="<Alt>" -nKey="<Ctl>" +# XFCE +# oKey="\<Alt\>" +# nKey="\<Ctl\>" +test "c" == "$key" && oKey="\<Alt\>" || oKey="\<Ctl\>" +test "c" == "$key" && nKey="\<Ctl\>" || nKey="\<Alt\>" #fix \& file=~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml -test -s $file && sed -i "s/$oKey/$nKey/g" $file +# test -s $file && sed -i "s/$oKey/$nKey/g" $file +test -s $file && sed -i "s/name=\"$oKey;q\"/name=\"$nKey;q\"/g" $file +test -s $file && sed -i "s/name=\"$oKey;d\"/name=\"$nKey;d\"/g" $file +test -s $file && sed -i "s/name=\"$oKey;f\"/name=\"$nKey;f\"/g" $file +test -s $file && sed -i "s/name=\"$oKey;e\"/name=\"$nKey;e\"/g" $file +test -s $file && sed -i "s/name=\"$oKey;t\"/name=\"$nKey;t\"/g" $file +# +test -s $file && sed -i "s/name=\"$oKey;h\"/name=\"$nKey;h\"/g" $file +test -s $file && sed -i "s/name=\"$oKey;Down\"/name=\"$nKey;Down\"/g" $file +test -s $file && sed -i "s/name=\"$oKey;Up\"/name=\"$nKey;Up\"/g" $file +test -s $file && sed -i "s/name=\"$oKey;Left\"/name=\"$nKey;Left\"/g" $file +test -s $file && sed -i "s/name=\"$oKey;Right\"/name=\"$nKey;Right\"/g" $file +# test -s $file && cat $file |grep "name=\"$nKey;" +# reload xfce4 + +# +# +# +# +# +# +# +# +# +# + -# gnome,plas, cinna/cmate/cxfce +# GNOME,plasma, cinna/cmate/cxfce #TODO diff --git a/ubt-core/src/dot/.fluxbox/fluxbox.sh b/ubt-core/src/dot/.fluxbox/fluxbox.sh index 99e0fe6..52d73e4 100644 --- a/ubt-core/src/dot/.fluxbox/fluxbox.sh +++ b/ubt-core/src/dot/.fluxbox/fluxbox.sh @@ -1,10 +1,10 @@ $RUN \ - # cd /tmp; file=Squared_for_Debian.zip; curl -fSL -k -O https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/flux/$file; \ + # cd /tmp; file=Squared_for_Debian.zip; curl -fSL -k -O https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/flux/$file; \ # unzip -d /usr/share/fluxbox/styles/ $file; rm -f /tmp/$file; \ - # wget -qO /usr/share/images/fluxbox/debian-squared.jpg https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/bg-debian-liteblue.png; \ + # wget -qO /usr/share/images/fluxbox/debian-squared.jpg https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bg/bg-debian-liteblue.png; \ \ - # wget --connect-timeout=3 -qO /usr/share/images/fluxbox/ubuntu-light.png https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/bg-debian-liteblue.png; \ - wget --connect-timeout=3 -qO /usr/share/images/fluxbox/ubuntu-light.png https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/pure-blue.jpg; \ + # wget --connect-timeout=3 -qO /usr/share/images/fluxbox/ubuntu-light.png https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bg/bg-debian-liteblue.png; \ + wget --connect-timeout=3 -qO /usr/share/images/fluxbox/ubuntu-light.png https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bg/pure-blue.jpg; \ mkdir -p /etc/skel/.config/clipit /etc/skel/.config/pnmixer /etc/skel/.config/gtk-3.0 /etc/skel/.fluxbox \ /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml; \ file=/etc/skel/.fluxbox/overlay; \ diff --git a/ubt-custom/README.md b/ubt-custom/README.md index a79a13e..0631433 100644 --- a/ubt-custom/README.md +++ b/ubt-custom/README.md @@ -1,34 +1,18 @@ -# mint - -从../ubuntu[core-v4-slim]继承的定制版，基于mint源安装xfce4.16, 皮肤效果对标deb9，试用项：Fcitx.sogou输入法 +# Cust定制版 - 从deb9演进(debian9 > ubuntu2004), mint主题+xfce4.16+tint2+plank -- 复用基础镜像 `FROM docker-headless:core-v4-slim` -- ~~mint,flux二合一： 考虑多用户，可选桌面..~~ +- 复用基础镜像 `FROM docker-headless:base-v5-slim` +- Ibus-rime, Fcitx-sogou输入法 ```bash -# 10022, 10089, 10081 -# env="-e PORT_SSH=10092 -e PORT_RDP=10099 -e PORT_VNC=10091" -docker run -it --rm --net=host $env -e VNC_OFFSET=10 infrastlabs/docker-headless:mint-v3 +# env="-e PORT_SSH=10022 -e PORT_RDP=10089 -e PORT_VNC=10081" +docker run -it --rm --net=host $env -e VNC_OFFSET=10 infrastlabs/docker-headless:latest + # gemmi-deb11 连接本地 声音无延迟、不卡顿 rdesktop localhost:10089 -uabc -pheadless -a 16 -g 1600x1010 -r sound:local ``` -**版本选择** - -https://wiki.debian.org/LTS #deb9: (July 6, 2020 to June 30, 2022 ) -https://ubuntu.com/about/release-cycle #ubt20: (2020.4 - 2030.4) - -![](./../_doc/deploy/assets/lts_ubuntu.png) - -- deb9: 2017, xrdp 0.9.16_OpenSSL 1.1.0l 10 Sep 2019|Xvnc TigerVNC 1.10.0|pulseaudio 10.0 -- deb10: 2019, -- deb11: 2021, -- ubt18: -- ubt20: xrdp 0.9.16_OpenSSL 1.1.1f 31 Mar 2020|Xvnc TigerVNC 1.12.0|pulseaudio 13.99.1 -- ubt22: - -![](./../_doc/deploy/assets/lts_debian.png) +**Xvnc** ```bash # ubt20: diff --git a/ubt-custom/src/Dockerfile b/ubt-custom/src/Dockerfile index f405e48..15bcdcb 100644 --- a/ubt-custom/src/Dockerfile +++ b/ubt-custom/src/Dockerfile @@ -46,7 +46,7 @@ RUN \ RUN apt.sh papirus-icon-theme greybird-gtk-theme; \ rm -f /usr/share/backgrounds/greybird.svg; \ \ - wget https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/bunsen-papirus-icon-theme_10.3-2_all.deb; \ + wget https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bunsen-papirus-icon-theme_10.3-2_all.deb; \ dpkg -i bunsen-papirus-icon-theme_10.3-2_all.deb; rm -f bunsen-papirus-icon-theme_10.3-2_all.deb; \ cd /usr/share/icons && rm -rf Papirus-Bunsen-Dark-bluegrey Papirus-Bunsen-Dark-grey Papirus-Dark Papirus-Light ePapirus; \ \ @@ -66,8 +66,8 @@ COPY --from=files1 /rootfs / COPY --from=files1 --chown=headless:headless /rootfs_home_headless /home/headless/ RUN cd /home/headless/.config/plank/dock1/launchers; rm -f ristretto* geany* flameshot*; \ \ - wget -qO /usr/share/backgrounds/xfce/xfce-teal.png https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/bg-debian-liteblue.png; \ - wget -qO /usr/share/backgrounds/xfce/xfce-pure-blue.jpg https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/pure-blue.jpg; \ + wget -qO /usr/share/backgrounds/xfce/xfce-teal.png https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bg/bg-debian-liteblue.png; \ + wget -qO /usr/share/backgrounds/xfce/xfce-pure-blue.jpg https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bg/pure-blue.jpg; \ \ # 清理ubt自带图标, keep项: hicolor # locolor gnome bloom diff --git a/ubt-custom/src/Dockerfile.sogou b/ubt-custom/src/Dockerfile.sogou index fadcc46..3b571e1 100644 --- a/ubt-custom/src/Dockerfile.sogou +++ b/ubt-custom/src/Dockerfile.sogou @@ -76,7 +76,7 @@ COPY --from=files2 /.bundle/sogoupinyin_4.0.1.2800.deb /.bundle/sogoupinyin_4.0. RUN apt.sh papirus-icon-theme greybird-gtk-theme; \ rm -f /usr/share/backgrounds/greybird.svg; \ \ - wget https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/bunsen-papirus-icon-theme_10.3-2_all.deb; \ + wget https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bunsen-papirus-icon-theme_10.3-2_all.deb; \ dpkg -i bunsen-papirus-icon-theme_10.3-2_all.deb; rm -f bunsen-papirus-icon-theme_10.3-2_all.deb; \ cd /usr/share/icons && rm -rf Papirus-Bunsen-Dark-bluegrey Papirus-Bunsen-Dark-grey Papirus-Dark Papirus-Light ePapirus; \ \ @@ -93,8 +93,8 @@ COPY --from=files1 --chown=headless:headless /rootfs_home_headless /home/headles RUN cd /home/headless/.config/plank/dock1/launchers; rm -f ristretto* geany* flameshot*; \ \ sed -i "s/ibus/fcitx/g" /etc/profile; \ - wget -qO /usr/share/backgrounds/xfce/xfce-teal.png https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/bg-debian-liteblue.png; \ - wget -qO /usr/share/backgrounds/xfce/xfce-pure-blue.jpg https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/pure-blue.jpg; \ + wget -qO /usr/share/backgrounds/xfce/xfce-teal.png https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bg/bg-debian-liteblue.png; \ + wget -qO /usr/share/backgrounds/xfce/xfce-pure-blue.jpg https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bg/pure-blue.jpg; \ \ # 清理ubt自带图标, keep项: hicolor # locolor gnome bloom diff --git a/ubt-desktop/README.md b/ubt-desktop/README.md index 082104e..cbeedee 100644 --- a/ubt-desktop/README.md +++ b/ubt-desktop/README.md @@ -27,7 +27,7 @@ docker run -it --rm -p 10081:10081 -p 10089:10089 \ infrastlabs/docker-headless:gnome # plasma: 需要privileged 否则start_kdeinit: Operation not permitted -docker run -it --rm -p 11081:10081 -p 11089:10089 --tmpfs /run --tmpfs /run/lock --tmpfs /tmp --privileged -v /sys/fs/cgroup:/sys/fs/cgroup infrastlabs/docker-headless:plas +docker run -it --rm -p 11081:10081 -p 11089:10089 --tmpfs /run --tmpfs /run/lock --tmpfs /tmp --privileged -v /sys/fs/cgroup:/sys/fs/cgroup infrastlabs/docker-headless:plasma ``` **TODO** diff --git a/ubt-desktop/buildx.sh b/ubt-desktop/buildx.sh index bc90679..fe74f20 100644 --- a/ubt-desktop/buildx.sh +++ b/ubt-desktop/buildx.sh @@ -34,10 +34,10 @@ cxfce) cache="--cache-from type=registry,ref=$ali/$ns/$cimg --cache-to type=registry,ref=$ali/$ns/$cimg" docker buildx build $cache $plat --push -t $repo/$ns/$img -f src/Dockerfile.cxfce . ;; -plas) - img="docker-headless:plas" +plasma) + img="docker-headless:plasma" plat="--platform linux/amd64,linux/arm64" - cimg="docker-headless-cache:plas" + cimg="docker-headless-cache:plasma" cache="--cache-from type=registry,ref=$ali/$ns/$cimg --cache-to type=registry,ref=$ali/$ns/$cimg" docker buildx build $cache $plat --push -t $repo/$ns/$img -f src/Dockerfile.plasma . ;; diff --git a/ubt-desktop/src/Dockerfile.gnome b/ubt-desktop/src/Dockerfile.gnome index 0bcacbc..92401c2 100644 --- a/ubt-desktop/src/Dockerfile.gnome +++ b/ubt-desktop/src/Dockerfile.gnome @@ -19,7 +19,7 @@ COPY --from=core /rootfs/conf / RUN bash /xconf.sh RUN \ - wget -qO /usr/share/backgrounds/warty-final-ubuntu.png https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/deploy/assets/bg-debian-liteblue.png; + wget -qO /usr/share/backgrounds/warty-final-ubuntu.png https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bg/bg-debian-liteblue.png; # HEADLESS ADD --chown=headless:headless src/.config /home/headless/.config