Skip to content

Commit

Permalink
!5 fix link, 微调
Browse files Browse the repository at this point in the history
* merge lines
* up
* cimg="docker-headless-cache:plas"
* up
* up link
  • Loading branch information
huapox committed Nov 5, 2022
1 parent 5ebacff commit c00096f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 17 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Multi-Desktop with `XRDP/NOVNC/PulseAudio` based on `Ubuntu20.04`, Formatting a

## step1: QuickStart

`docker run -it --rm --shm-size 1g --net=host infrastlabs/docker-headless`
`docker run -it --rm --shm-size 1g --net=host infrastlabs/docker-headless:latest`

-- | Conn | PASS | ReadOnly
--- | --- | --- | ---
Expand All @@ -26,7 +26,7 @@ SSH | ssh -p 10022 [email protected] | `headless` | -
- Audio support. (xrdp+pulseaudio/noVNC+broadcast)
- Locale/TZ support.
- 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)`
- Slim image: `core: 170.53 MB`, `latest: 277.48 MB`, `sogou: 354.15 MB`

![](./_doc/res/design/RDesktop.png)

Expand Down Expand Up @@ -69,7 +69,7 @@ wget https://vscode.cdn.azure.cn/stable/6cba118ac49a1b88332f312a8f67186f7f3c1643
wget https://download.jetbrains.com.cn/idea/ideaIC-2016.3.8-no-jdk.tar.gz
```

![](_doc/mannual/res/02/ide2-vscode.png)
![](_doc/res/02/ide2-vscode.png)

**(2)Office**

Expand All @@ -86,12 +86,12 @@ 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}
```

![](_doc/mannual/res/02/apps-office-wps.jpg)
![](_doc/res/02/apps-office-wps.jpg)


**(3)Docker Dind**

![](_doc/mannual/res/02/dind2-headlessLinks.png)
![](_doc/res/02/dind2-headlessLinks.png)

```bash
# exec@host: docker,dcp
Expand Down
17 changes: 7 additions & 10 deletions README_zh.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
**Docker云桌面**(docker-headless)

基于`Ubuntu20.04`胖容器+远程接入, 实现`Linux`下私人桌面、云端办公。在生产跑浏览器做调试/维护。在服务器搭建专用开发环境,公司/Home互通办公。镜像体积小、支持多语言、提供多桌面 [[Detail]](./Detail.md)
基于`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)
Expand Down Expand Up @@ -37,15 +37,12 @@ SSH | ssh -p 10022 [email protected] | `headless` | -
# 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 \
infrastlabs/docker-headless:cmate
-e L=en_US -e VNC_OFFSET=99 -e START_SYSTEMD=false infrastlabs/docker-headless:cmate

# Gnome with systemd, cgroup_v2: --cgroupns=host (docker 20.10+)
docker run -it --rm --net=host --shm-size 1g -e VNC_OFFSET=99 \
--tmpfs /run --tmpfs /run/lock --tmpfs /tmp \
--cap-add SYS_BOOT --cap-add SYS_ADMIN \
-v /sys/fs/cgroup:/sys/fs/cgroup:rw \
infrastlabs/docker-headless:gnome
--tmpfs /run --tmpfs /run/lock --tmpfs /tmp -v /sys/fs/cgroup:/sys/fs/cgroup:rw \
--cap-add SYS_BOOT --cap-add SYS_ADMIN infrastlabs/docker-headless:gnome
```

**(1)Dev开发环境搭建** (java, golang, nodejs)
Expand Down Expand Up @@ -86,7 +83,7 @@ wget https://vscode.cdn.azure.cn/stable/6cba118ac49a1b88332f312a8f67186f7f3c1643
wget https://download.jetbrains.com.cn/idea/ideaIC-2016.3.8-no-jdk.tar.gz
```

![](_doc/mannual/res/02/ide2-vscode.png)
![](_doc/res/02/ide2-vscode.png)

**(2)浏览器、Office办公**

Expand All @@ -105,14 +102,14 @@ 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}
```

![](_doc/mannual/res/02/apps-office-wps.jpg)
![](_doc/res/02/apps-office-wps.jpg)


**(3)Docker Dind模式**

支持在容器内调用宿主机的dockerd,用于dockerfile构建、容器控制等场景。

![](_doc/mannual/res/02/dind2-headlessLinks.png)
![](_doc/res/02/dind2-headlessLinks.png)

```bash
# 宿主机运行:获取docker,docker-compose文件:
Expand Down
2 changes: 1 addition & 1 deletion _doc/CloudDesktop.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CloudDesktop简介

支持Web,RDP,SSH多种远程方式
镜像体积小、支持多语言、提供多桌面。Web,RDP,SSH多种远程接入

## 一、WEB浏览器

Expand Down
2 changes: 1 addition & 1 deletion ubt-desktop/buildx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ cxfce)
plasma)
img="docker-headless:plasma"
plat="--platform linux/amd64,linux/arm64"
cimg="docker-headless-cache:plasma"
cimg="docker-headless-cache:plas"
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 .
;;
Expand Down

0 comments on commit c00096f

Please sign in to comment.