You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pegasus.apache.org by wu...@apache.org on 2021/01/05 03:59:04 UTC
[incubator-pegasus-website] 02/02: support build docs for 1.9.0
This is an automated email from the ASF dual-hosted git repository.
wutao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus-website.git
commit ec090428da588f7a8dd2d5da5b6cb52a932e85f3
Author: neverchanje <wu...@gmail.com>
AuthorDate: Tue Jan 5 11:58:30 2021 +0800
support build docs for 1.9.0
---
_data/en/translate.yml | 2 +-
_data/zh/translate.yml | 2 +-
_docs/zh/1.10.0/compile-by-docker.md | 67 ----------------------------------
_docs/zh/1.10.0/compile-from-source.md | 19 +---------
_docs/zh/1.11.3/compile-by-docker.md | 54 ---------------------------
_docs/zh/1.11.6/compile-by-docker.md | 54 ---------------------------
_docs/zh/1.12.3/compile-by-docker.md | 54 ---------------------------
_docs/zh/2.0.0/compile-by-docker.md | 54 ---------------------------
_docs/zh/build/compile-by-docker.md | 1 -
_docs/zh/downloads.md | 9 +++++
10 files changed, 13 insertions(+), 303 deletions(-)
diff --git a/_data/en/translate.yml b/_data/en/translate.yml
index 9163ed0..cd5c47d 100644
--- a/_data/en/translate.yml
+++ b/_data/en/translate.yml
@@ -4,7 +4,7 @@ title_downloads: "Downloads"
title_build_pegasus: "Building Pegasus"
title_installation: "Installation"
title_compile-from-source: "Compile from source"
-title_compile-by-docker: "Compile by docker"
+title_compile-by-docker: "Compile by docker (recommended)"
title_architecture: "Architecture"
title_data-model: "Data Model"
title_documentation: "Docs"
diff --git a/_data/zh/translate.yml b/_data/zh/translate.yml
index 5ddffdf..1888218 100644
--- a/_data/zh/translate.yml
+++ b/_data/zh/translate.yml
@@ -4,7 +4,7 @@ title_build_pegasus: "编译构建"
title_downloads: "下载"
title_installation: "安装构建"
title_compile-from-source: "从源码编译"
-title_compile-by-docker: "使用Docker完成编译"
+title_compile-by-docker: "使用Docker完成编译（推荐）"
title_architecture: "系统架构"
title_data-model: "数据模型"
title_documentation: "文档"
diff --git a/_docs/zh/1.10.0/compile-by-docker.md b/_docs/zh/1.10.0/compile-by-docker.md
deleted file mode 100644
index 65355ef..0000000
--- a/_docs/zh/1.10.0/compile-by-docker.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-permalink: 1.10.0/docs/build/compile-by-docker/
-version: 1.10.0
----
-
-## 下载Docker镜像
-
-```sh
-docker pull apachepegasus/build-env:{{ page.version }}-centos7
-```
-
-```sh
-docker pull apachepegasus/build-env:{{ page.version }}-ubuntu1604
-```
-
-## 编译
-
-请先参考[下载文档](/docs/downloads)获取源码到某目录（`/your/local/apache-pegasus-source`）下。
-
-由于历史原因，此版本需要额外下载第三方库源码包，同时还需略过安装 redis-proxy：
-
-```sh
-cd /your/local/apache-pegasus-source/rdsn/thirdparty
-wget https://pegasus-thirdparties.oss-cn-beijing.aliyuncs.com/1.10.0-thirdparties-src.zip
-unzip 1.10.0-thirdparties-src.zip
-
-cd ../..
-sed -i /"add_subdirectory(redis_protocol)"/d src/CMakeLists.txt
-```
-
-随后运行以下命令：
-
-```sh
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh build -c"
-```
-
-编译的结果会被放在项目根目录的`DSN_ROOT/`文件夹下，其中包含bin、include、lib目录。
-
-## 编译打包
-
-打包server端程序包，用于服务部署：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_server"
-```
-
-打包client端库，用于C/C++端客户端开发：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_client"
-```
-
-打包tools工具集，里面包含了各种工具（shell、bench）：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_tools"
-```
-
-编译成功后，推荐先[体验onebox集群](/overview/onebox)。
diff --git a/_docs/zh/1.10.0/compile-from-source.md b/_docs/zh/1.10.0/compile-from-source.md
index 7e6aaf3..713430b 100755
--- a/_docs/zh/1.10.0/compile-from-source.md
+++ b/_docs/zh/1.10.0/compile-from-source.md
@@ -1,6 +1,6 @@
---
-permalink: 1.11.6/docs/build/compile-from-source/
-version: 1.11.6
+permalink: 1.10.0/docs/build/compile-from-source/
+version: 1.10.0
---
Pegasus目前只支持Linux平台进行源码编译。编译过程中遇到问题，可以通过[Github Issues]({{ site.pegasus_github_url }}/issues)向我们咨询。
@@ -22,22 +22,7 @@ Pegasus目前只支持Linux平台进行源码编译。编译过程中遇到问
请先参考[下载文档](/docs/downloads)获取源码。
-由于历史原因，此版本需要额外下载第三方库源码包，同时还需略过安装 redis-proxy：
-
-```sh
-cd /your/local/apache-pegasus-source/rdsn/thirdparty
-wget https://pegasus-thirdparties.oss-cn-beijing.aliyuncs.com/1.10.0-thirdparties-src.zip
-unzip 1.10.0-thirdparties-src.zip
-
-cd ../..
-sed -i /"add_subdirectory(redis_protocol)"/d src/CMakeLists.txt
-```
-
-随后运行编译：
-
```bash
-cd /your/local/apache-pegasus-source
-
./run.sh build -c
```
diff --git a/_docs/zh/1.11.3/compile-by-docker.md b/_docs/zh/1.11.3/compile-by-docker.md
deleted file mode 100644
index d475357..0000000
--- a/_docs/zh/1.11.3/compile-by-docker.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-permalink: 1.11.3/docs/build/compile-by-docker/
-version: 1.11.3
----
-
-## 下载Docker镜像
-
-```sh
-docker pull apachepegasus/build-env:{{ page.version }}-centos7
-```
-
-```sh
-docker pull apachepegasus/build-env:{{ page.version }}-ubuntu1604
-```
-
-## 编译
-
-请先参考[下载文档](/docs/downloads)获取源码到某目录（`/your/local/apache-pegasus-source`）下。随后运行以下命令：
-
-```sh
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh build -c"
-```
-
-编译的结果会被放在项目根目录的`DSN_ROOT/`文件夹下，其中包含bin、include、lib目录。
-
-## 编译打包
-
-打包server端程序包，用于服务部署：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_server"
-```
-
-打包client端库，用于C/C++端客户端开发：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_client"
-```
-
-打包tools工具集，里面包含了各种工具（shell、bench）：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_tools"
-```
-
-编译成功后，推荐先[体验onebox集群](/overview/onebox)。
diff --git a/_docs/zh/1.11.6/compile-by-docker.md b/_docs/zh/1.11.6/compile-by-docker.md
deleted file mode 100644
index 418efd9..0000000
--- a/_docs/zh/1.11.6/compile-by-docker.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-permalink: 1.11.6/docs/build/compile-by-docker/
-version: 1.11.6
----
-
-## 下载Docker镜像
-
-```sh
-docker pull apachepegasus/build-env:{{ page.version }}-centos7
-```
-
-```sh
-docker pull apachepegasus/build-env:{{ page.version }}-ubuntu1604
-```
-
-## 编译
-
-请先参考[下载文档](/docs/downloads)获取源码到某目录（`/your/local/apache-pegasus-source`）下。随后运行以下命令：
-
-```sh
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh build -c"
-```
-
-编译的结果会被放在项目根目录的`DSN_ROOT/`文件夹下，其中包含bin、include、lib目录。
-
-## 编译打包
-
-打包server端程序包，用于服务部署：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_server"
-```
-
-打包client端库，用于C/C++端客户端开发：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_client"
-```
-
-打包tools工具集，里面包含了各种工具（shell、bench）：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_tools"
-```
-
-编译成功后，推荐先[体验onebox集群](/overview/onebox)。
diff --git a/_docs/zh/1.12.3/compile-by-docker.md b/_docs/zh/1.12.3/compile-by-docker.md
deleted file mode 100644
index c5de95e..0000000
--- a/_docs/zh/1.12.3/compile-by-docker.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-permalink: 1.12.3/docs/build/compile-by-docker/
-version: 1.12.3
----
-
-## 下载Docker镜像
-
-```sh
-docker pull apachepegasus/build-env:{{ page.version }}-centos7
-```
-
-```sh
-docker pull apachepegasus/build-env:{{ page.version }}-ubuntu1604
-```
-
-## 编译
-
-请先参考[下载文档](/docs/downloads)获取源码到某目录（`/your/local/apache-pegasus-source`）下。随后运行以下命令：
-
-```sh
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh build -c"
-```
-
-编译的结果会被放在项目根目录的`DSN_ROOT/`文件夹下，其中包含bin、include、lib目录。
-
-## 编译打包
-
-打包server端程序包，用于服务部署：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_server"
-```
-
-打包client端库，用于C/C++端客户端开发：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_client"
-```
-
-打包tools工具集，里面包含了各种工具（shell、bench）：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_tools"
-```
-
-编译成功后，推荐先[体验onebox集群](/overview/onebox)。
diff --git a/_docs/zh/2.0.0/compile-by-docker.md b/_docs/zh/2.0.0/compile-by-docker.md
deleted file mode 100644
index 1a283eb..0000000
--- a/_docs/zh/2.0.0/compile-by-docker.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-permalink: 2.0.0/docs/build/compile-by-docker/
-version: 2.0.0
----
-
-## 下载Docker镜像
-
-```sh
-docker pull apachepegasus/build-env:{{ page.version }}-centos7
-```
-
-```sh
-docker pull apachepegasus/build-env:{{ page.version }}-ubuntu1604
-```
-
-## 编译
-
-请先参考[下载文档](/docs/downloads)获取源码到某目录（`/your/local/apache-pegasus-source`）下。随后运行以下命令：
-
-```sh
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh build -c"
-```
-
-编译的结果会被放在项目根目录的`DSN_ROOT/`文件夹下，其中包含bin、include、lib目录。
-
-## 编译打包
-
-打包server端程序包，用于服务部署：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_server"
-```
-
-打包client端库，用于C/C++端客户端开发：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_client"
-```
-
-打包tools工具集，里面包含了各种工具（shell、bench）：
-
-```bash
-docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:{{ page.version }}-centos7 \
- /bin/bash -c "./run.sh pack_tools"
-```
-
-编译成功后，推荐先[体验onebox集群](/overview/onebox)。
diff --git a/_docs/zh/build/compile-by-docker.md b/_docs/zh/build/compile-by-docker.md
index 198fc79..7077b0f 100755
--- a/_docs/zh/build/compile-by-docker.md
+++ b/_docs/zh/build/compile-by-docker.md
@@ -1,6 +1,5 @@
---
permalink: docs/build/compile-by-docker/
-version: latest
---
## 下载Docker镜像
diff --git a/_docs/zh/downloads.md b/_docs/zh/downloads.md
index e454af2..c6a7d89 100644
--- a/_docs/zh/downloads.md
+++ b/_docs/zh/downloads.md
@@ -31,6 +31,8 @@ git clone -b v2.1.0 --recursive https://github.com/apache/incubator-pegasus.git
[1.11.3-rn]: https://github.com/apache/incubator-pegasus/releases/tag/v1.11.3
[1.10.0-src]: https://github.com/apache/incubator-pegasus/releases/download/v1.10.0/apache-pegasus-1.10.0-incubating-src.zip
[1.10.0-rn]: https://github.com/apache/incubator-pegasus/releases/tag/v1.10.0
+[1.9.0-src]: https://github.com/apache/incubator-pegasus/releases/download/v1.9.0/apache-pegasus-1.9.0-incubating-src.zip
+[1.9.0-rn]: https://github.com/apache/incubator-pegasus/releases/tag/v1.9.0
Name | Package | Release Notes
---|---|---
@@ -39,3 +41,10 @@ Apache Pegasus 1.12.3 | [Source][1.12.3-src] | [Release Notes][1.12.3-rn]
Apache Pegasus 1.11.6 | [Source][1.11.6-src] | [Release Notes][1.11.6-rn]
Apache Pegasus 1.11.3 | [Source][1.11.3-src] | [Release Notes][1.11.3-rn]
Apache Pegasus 1.10.0 | [Source][1.10.0-src] | [Release Notes][1.10.0-rn]
+Apache Pegasus 1.9.0 | [Source][1.9.0-src] | [Release Notes][1.9.0-rn]
+
+上述各版本均可找到对应编译环境的镜像：<https://hub.docker.com/r/apachepegasus/build-env/tags>，请参考 [{{site.data.translate['title_compile-by-docker'}}](docs/build/compile-by-docker/) 完成编译。
+
+```
+docker pull apachepegasus/build-env:{VERSION}-{OS}
+```
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org