!4 _doc文档整理； plas> plasma

* plas> plasma
* plas> plasma
* format
* up
* mv ## 五、发行版选择
* u
* up
* `14M`的ISO镜像(内置Docker):
* Detail
* [Detail]
*  [Detail](./detail.md)
* up links
* drop t1.md
* a
* up
* up
* 客户端选用
* up
* scenenary-hw; fill 常见问题
* rename 适用场景与问题
* up 使用手册
* merge 使用手册.md
* out Locale.md
* out todo
* up linkx
* mv out mannual
* mv assets
* up assets's ref
* rename 适用场景与建议
* merge 生产部署指引.md
* S
* UP
* UP
* UP
* up
* up
* sort up dtl
* Changelog
* update dtl
* up sethotkey
* up sethotkey

Changelog.md

@@ -1,4 +1,4 @@
-# changeLog
+# Changelog
 
 
 ## v0

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  
 ```
 

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 [email protected] | `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 [email protected] | `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
 

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 [email protected] | `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 [email protected] | `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 \

_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)

_doc/mannual/b0-todo.md → _doc/TODO.md

@@ -1,4 +1,4 @@
-# 
+# TODO
 
 - 接入: mRemoteNG, 浏览器, Xshell (mstsc: 双屏)
 - 音频: RDP, noVNC, `play xx.mp3`