From 071497760cb6449a405b68403dd3441761afee0d Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Sat, 27 Nov 2021 19:25:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3CentOS=E5=BF=AB=E9=80=9F?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E8=AF=B4=E6=98=8E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- guide/quick-start.md | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/guide/quick-start.md b/guide/quick-start.md index 6aad773..6aad1da 100644 --- a/guide/quick-start.md +++ b/guide/quick-start.md @@ -8,6 +8,61 @@ Docker-Compose 1.29.2以上，[官方安装手册](https://docs.docker.com/compo Kubernetes 1.18以上, [官方安装手册](https://kubernetes.io/docs/tasks/tools/) +#### 环境准备（以CentOS 7为例说明） + +以root权限登陆系统，更新系统并安装docker： +``` +yum -y update +yum install -y wget docker docker-compose +systemctl enable docker +reboot +``` + +安装docker-compose： +``` +curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +``` + +配置docker-compose权限： +``` +chmod +x /usr/local/bin/docker-compose +``` + +验证环境可用性： +``` +[root@localhost ~]# docker version +Client: + Version: 1.13.1 + API version: 1.26 + Package version: docker-1.13.1-208.git7d71120.el7_9.x86_64 + Go version: go1.10.3 + Git commit: 7d71120/1.13.1 + Built: Mon Jun 7 15:36:09 2021 + OS/Arch: linux/amd64 + +Server: + Version: 1.13.1 + API version: 1.26 (minimum version 1.12) + Package version: docker-1.13.1-208.git7d71120.el7_9.x86_64 + Go version: go1.10.3 + Git commit: 7d71120/1.13.1 + Built: Mon Jun 7 15:36:09 2021 + OS/Arch: linux/amd64 + Experimental: false + +[root@localhost ~]# systemctl status docker +● docker.service - Docker Application Container Engine + Loaded: loaded (/usr/lib/systemd/system/docker.service; enabled; vendor preset: disabled) + Active: active (running) since 六 2021-11-27 18:42:45 CST; 8min ago + Docs: http://docs.docker.com + Main PID: 1073 (dockerd-current) + CGroup: /system.slice/docker.service + ├─1073 /usr/bin/dockerd-current --add-runtime docker-runc=/usr/libexec/docker/docker-runc-current --default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd --userland-proxy-path=... + └─1136 /usr/bin/docker-containerd-current -l unix:///var/run/docker/libcontainerd/docker-containerd.sock --metrics-interval=0 --start-timeout 2m --state-dir /var/run/docker/libcontainerd/co... + +[root@localhost ~]# docker-compose --version +docker-compose version 1.29.2, build 5becea4c +``` ### docker部署 -- Gitee From 16b51ceaa2af37046ca40fbda284a95acbdcd6b9 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Sun, 28 Nov 2021 09:05:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0CentOS=207.9=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E8=AF=B4=E6=98=8E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #I4K3PQ --- guide/centos-install.md | 92 +++++++++++++++++++++++++++++++++++++++++ guide/quick-start.md | 60 ++------------------------- 2 files changed, 95 insertions(+), 57 deletions(-) create mode 100644 guide/centos-install.md diff --git a/guide/centos-install.md b/guide/centos-install.md new file mode 100644 index 0000000..996b216 --- /dev/null +++ b/guide/centos-install.md @@ -0,0 +1,92 @@ +# CentOS 7.9安装注意事项 + +在CentOS 7.9安装过程需要替换自带的docker。 + +## 详细步骤 + +以root权限登陆系统，更新系统并安装docker。 + +更新操作系统,CentOS 7.9最新版本： +``` +yum -y update +``` + +移除CentOS默认的docker版本： +``` +yum remove docker \ + docker-client \ + docker-client-latest \ + docker-common \ + docker-latest \ + docker-latest-logrotate \ + docker-logrotate \ + docker-engine +``` + +配置docker官方yum仓库： +``` +yum install -y yum-utils +yum-config-manager \ + --add-repo \ + https://download.docker.com/linux/centos/docker-ce.repo +``` + +安装docker并启动： +``` +yum install docker-ce docker-ce-cli containerd.io +systemctl enable docker +systemctl restart docker +``` + +安装docker-compose： +``` +curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +``` + +配置docker-compose权限： +``` +chmod +x /usr/local/bin/docker-compose +``` + +## 版本验证 + +验证环境可用性如下： + +``` +[root@localhost ~]# docker version +Client: Docker Engine - Community + Version: 20.10.11 + API version: 1.41 + Go version: go1.16.9 + Git commit: dea9396 + Built: Thu Nov 18 00:38:53 2021 + OS/Arch: linux/amd64 + Context: default + Experimental: true + +Server: Docker Engine - Community + Engine: + Version: 20.10.11 + API version: 1.41 (minimum version 1.12) + Go version: go1.16.9 + Git commit: 847da18 + Built: Thu Nov 18 00:37:17 2021 + OS/Arch: linux/amd64 + Experimental: false + containerd: + Version: 1.4.12 + GitCommit: 7b11cfaabd73bb80907dd23182b9347b4245eb5d + runc: + Version: 1.0.2 + GitCommit: v1.0.2-0-g52b36a2 + docker-init: + Version: 0.19.0 + GitCommit: de40ad0 + +[root@localhost ~]# docker-compose version +docker-compose version 1.29.2, build 5becea4c +docker-py version: 5.0.0 +CPython version: 3.7.10 +OpenSSL version: OpenSSL 1.1.0l 10 Sep 2019 + +``` \ No newline at end of file diff --git a/guide/quick-start.md b/guide/quick-start.md index 6aad1da..79a52f1 100644 --- a/guide/quick-start.md +++ b/guide/quick-start.md @@ -2,69 +2,15 @@ ### 系统要求 +推荐使用Ubuntu 21.04系统安装，如[CentOS 7可参考](https://docs.jianmu.dev/guide/centos-install.html)。 + Docker 19.30以上，[官方安装手册](https://docs.docker.com/get-started/#download-and-install-docker) Docker-Compose 1.29.2以上，[官方安装手册](https://docs.docker.com/compose/install/#install-compose) Kubernetes 1.18以上, [官方安装手册](https://kubernetes.io/docs/tasks/tools/) -#### 环境准备（以CentOS 7为例说明） - -以root权限登陆系统，更新系统并安装docker： -``` -yum -y update -yum install -y wget docker docker-compose -systemctl enable docker -reboot -``` - -安装docker-compose： -``` -curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose -``` - -配置docker-compose权限： -``` -chmod +x /usr/local/bin/docker-compose -``` - -验证环境可用性： -``` -[root@localhost ~]# docker version -Client: - Version: 1.13.1 - API version: 1.26 - Package version: docker-1.13.1-208.git7d71120.el7_9.x86_64 - Go version: go1.10.3 - Git commit: 7d71120/1.13.1 - Built: Mon Jun 7 15:36:09 2021 - OS/Arch: linux/amd64 - -Server: - Version: 1.13.1 - API version: 1.26 (minimum version 1.12) - Package version: docker-1.13.1-208.git7d71120.el7_9.x86_64 - Go version: go1.10.3 - Git commit: 7d71120/1.13.1 - Built: Mon Jun 7 15:36:09 2021 - OS/Arch: linux/amd64 - Experimental: false - -[root@localhost ~]# systemctl status docker -● docker.service - Docker Application Container Engine - Loaded: loaded (/usr/lib/systemd/system/docker.service; enabled; vendor preset: disabled) - Active: active (running) since 六 2021-11-27 18:42:45 CST; 8min ago - Docs: http://docs.docker.com - Main PID: 1073 (dockerd-current) - CGroup: /system.slice/docker.service - ├─1073 /usr/bin/dockerd-current --add-runtime docker-runc=/usr/libexec/docker/docker-runc-current --default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd --userland-proxy-path=... - └─1136 /usr/bin/docker-containerd-current -l unix:///var/run/docker/libcontainerd/docker-containerd.sock --metrics-interval=0 --start-timeout 2m --state-dir /var/run/docker/libcontainerd/co... - -[root@localhost ~]# docker-compose --version -docker-compose version 1.29.2, build 5becea4c -``` - -### docker部署 +### docker-compose部署 **下载`docker-compose.yml`** -- Gitee From 0275c51da49ecf60b9ef89ba124eec3407e5301c Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Sun, 28 Nov 2021 09:17:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0README=EF=BC=8C=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E5=AE=98=E6=96=B9=E6=96=87=E6=A1=A3=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 897c7e6..5057617 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# jianmu-docs +# 建木项目文档 #### 介绍 -jianmu-docs是建木团队开源的建木自动化集成平台相关的所有文档说明 +jianmu-docs是建木团队开源的建木自动化集成平台相关文档说明，通过该文档库维护官方文档更新，详情见：https://docs.jianmu.dev/guide/。 -#### 安装 +#### 文档安装 ``` bash # 安装依赖 @@ -16,5 +16,5 @@ npm run dev 或 yarn dev npm run build 或 yarn build ``` -#### 开源协议 -本项目基于Apache License 2.0协议。 +#### 文档开源协议 +本项目基于木兰宽松许可证, 第2版。 -- Gitee