From 75107473594fd161f4006ac2e100291daedebc21 Mon Sep 17 00:00:00 2001 From: Baobhan Sith <80159437+Heavrnl@users.noreply.github.com> Date: Wed, 7 May 2025 16:42:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0arm64=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BD=BF=E7=94=A8RDP=E7=9B=B8=E5=85=B3=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 ++++++++++++-- doc/README_EN.md | 16 ++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 88c6e85..7d21202 100644 --- a/README.md +++ b/README.md @@ -80,11 +80,21 @@ ```bash mkdir ./nexus-terminal && cd ./nexus-terminal ``` -下载仓库的 [**docker-compose.yml**](https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/docker-compose.yml) 和 [**.env**](https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/.env) 到目录下(arm 用户请查看下方的注意事项) +优化后的句子更加简洁、清晰,并保持原意: +--- + +下载仓库中的 [**docker-compose.yml**](https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/docker-compose.yml) 和 [**.env**](https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/.env) 文件到当前目录。 ```bash wget https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/docker-compose.yml -O docker-compose.yml && wget https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/.env -O .env ``` +> ⚠️ **注意:** +> +> * **arm64 用户**请将 `docker-compose.yml` 中的镜像 `guacamole/guacd:latest` 替换为 `guacamole/guacd:1.6.0-RC1`。 +> * **armv7 用户**请参考下方注意事项。 + + + 配置 nginx ```conf @@ -178,7 +188,7 @@ docker-compose up -d 1. **双文件管理器**:可以在布局中添加两个文件管理器组件(实验性功能,可能存在不稳定情况)。 2. **多文本编辑器**:在同一布局中添加多个文本编辑器的功能尚未实现。 -3. ARM 用户请使用此处的 [docker-compose.yml](https://github.com/Heavrnl/nexus-terminal/blob/main/doc/arm/docker-compose.yml)。由于 Apache Guacamole 未提供 guacd 的 ARM 架构镜像,所以禁用 RDP 功能,相关镜像暂时不再拉取。 +3. ARMv7 用户请使用此处的 [docker-compose.yml](https://github.com/Heavrnl/nexus-terminal/blob/main/doc/arm/docker-compose.yml)。由于 Apache Guacamole 未提供 guacd 的 ARMv7 架构镜像,所以禁用 RDP 功能,相关镜像暂时不再拉取。 4. 由于本人手头没有arm机器,所以没有实际测试,运行中可能会有意想不到的bug 5. 关于数据备份,请自行备份目录下的 data 文件夹,本项目不提供相关备份功能。 diff --git a/doc/README_EN.md b/doc/README_EN.md index 16f2def..ed08ad5 100644 --- a/doc/README_EN.md +++ b/doc/README_EN.md @@ -65,12 +65,23 @@ Create a new folder ```bash mkdir ./nexus-terminal && cd ./nexus-terminal ``` -Download the repository's [**docker-compose.yml**](https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/docker-compose.yml) and [**.env**](https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/.env) files into the directory +好的,这是对应的英文版本说明: + +--- + +Download the [**docker-compose.yml**](https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/docker-compose.yml) and [**.env**](https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/.env) files from the repository to your current directory. + ```bash wget https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/docker-compose.yml -O docker-compose.yml && wget https://raw.githubusercontent.com/Heavrnl/nexus-terminal/refs/heads/main/.env -O .env ``` + +> ⚠️ **Note:** +> +> * For **arm64** users, replace `guacamole/guacd:latest` with `guacamole/guacd:1.6.0-RC1` in the `docker-compose.yml` file. +> * For **armv7** users, please refer to the additional notes below. + Configure nginx ```conf location / { @@ -164,7 +175,8 @@ Here are some implicit practical features. 1. **Dual File Managers**: You can add two file manager components in the layout (experimental feature, may be unstable). 2. **Multiple Text Editors**: The functionality to add multiple text editors in the same layout has not yet been implemented. -3. ARM users, please use the [docker-compose.yml](https://github.com/Heavrnl/nexus-terminal/blob/main/doc/arm/docker-compose.yml) provided here. Since Apache Guacamole does not provide an ARM architecture image for `guacd`, the RDP feature has been disabled, and the related image will no longer be pulled for the time being. +3. For **ARMv7** users, please use the [docker-compose.yml](https://github.com/Heavrnl/nexus-terminal/blob/main/doc/arm/docker-compose.yml) provided here. +Since Apache Guacamole does not provide an ARMv7-compatible image for `guacd`, the RDP feature has been disabled, and related images will not be pulled for now. 4. Since I don't have an ARM machine on hand, I haven't conducted actual testing, so unexpected bugs may occur during runtime. 5. For data backup, please back up the **data** folder in the directory yourself. This project does not provide any backup functionality.