Skip to content

Commit 6dd5895

Browse files
committed
Merge remote-tracking branch 'origin/v2' into v2
2 parents 193c509 + c110bca commit 6dd5895

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/compile-and-deploy.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ jobs:
3434
run: |
3535
git fetch origin deploy:deploy
3636
mike deploy --push --branch deploy --rebase ${{ matrix.version }}
37-
if [[ ${{ matrix.version }} == "v1" ]]; then
38-
# 先默认v1,等v2上线后改成v2
37+
if [[ ${{ matrix.version }} == "v2" ]]; then
3938
mike set-default -b deploy ${{ matrix.version }}
4039
fi
4140

docs/installation/offline_installtion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
以 root 用户通过 ssh 协议登录到部署服务器, 对安装包进行解压:
4040
```
41-
tar -zxvf maxkb-ce-v2.0.0-offline.tar.gz
41+
tar -zxvf maxkb-v2.0.0-offline-installer.tar.gz
4242
```
4343

4444
### 3.2 安装配置(可选)

docs/installation/online_installtion.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
在配置 docker 环境的操作系统中,仅需执行以下命令即可一键完成 MaxKB 的安装:
3030
```
3131
# Linux 操作系统
32-
docker run -d --name=maxkb --restart=always -p 8080:8080 -v ~/.maxkb:/opt/maxkb registry.fit2cloud.com/maxkb/maxkb:v2
32+
docker run -d --name=maxkb --restart=always -p 8080:8080 -v ~/.maxkb:/opt/maxkb registry.fit2cloud.com/maxkb/maxkb
3333

3434
# Windows 操作系统
35-
docker run -d --name=maxkb --restart=always -p 8080:8080 -v C:/maxkb:/opt/maxkb registry.fit2cloud.com/maxkb/maxkb:v2
35+
docker run -d --name=maxkb --restart=always -p 8080:8080 -v C:/maxkb:/opt/maxkb registry.fit2cloud.com/maxkb/maxkb
3636
```
3737
3838
待所有容器状态显示为`healthy`后,可通过浏览器访问 MaxKB:
@@ -52,7 +52,7 @@
5252

5353
(1) 下载最新镜像
5454
```
55-
docker pull registry.fit2cloud.com/maxkb/maxkb:v2
55+
docker pull registry.fit2cloud.com/maxkb/maxkb
5656
```
5757
(2)查看并确认上一次数据持久化目录,复制保存
5858
```
@@ -74,5 +74,5 @@
7474
**注意:** 务必确认数据持久化目录(即命令行中 -v后的目录)要跟第 (2) 步查看目录保持一致,否则启动后整个系统的数据为空。
7575

7676
```
77-
docker run -d --name=maxkb --restart=always -p 8080:8080 -v ~/.maxkb:/opt/maxkb registry.fit2cloud.com/maxkb/maxkb:v2
77+
docker run -d --name=maxkb --restart=always -p 8080:8080 -v ~/.maxkb:/opt/maxkb registry.fit2cloud.com/maxkb/maxkb
7878
```

0 commit comments

Comments
 (0)