88 lines
2.7 KiB
Diff
88 lines
2.7 KiB
Diff
From 4519bf3ce98b819c0cf421b902df3124bc9e4374 Mon Sep 17 00:00:00 2001
|
||
From: wo_cow <niuqianqian@huawei.com>
|
||
Date: Sat, 26 Nov 2022 17:05:18 +0800
|
||
Subject: [PATCH] add documentation related to docker images. set nsprobe to
|
||
start automatically
|
||
|
||
---
|
||
README.md | 44 +++++++++++++++++++++++++++++++++++++----
|
||
config/gala-gopher.conf | 4 +++-
|
||
2 files changed, 43 insertions(+), 5 deletions(-)
|
||
|
||
diff --git a/README.md b/README.md
|
||
index efcea94..002dbb6 100644
|
||
--- a/README.md
|
||
+++ b/README.md
|
||
@@ -59,13 +59,49 @@ gala-gopher集成了常用的native探针以及知名中间件探针；gala-goph
|
||
|
||
#### 基于容器镜像安装运行
|
||
|
||
-- 准备工作
|
||
|
||
- 获取gala-gopher的rpm包，获取方式详见第一小节[基于rpm包安装运行](#基于rpm包安装运行)。
|
||
+- 获取容器镜像
|
||
|
||
-- 生成容器镜像
|
||
+ 用户可以选择直接[获取官方容器镜像](#docker1)或自行[构建容器镜像](#docker2)
|
||
|
||
- 用于生成容器镜像的Dockerfile文件归档在[build目录](./build)，生成方法详见[如何生成gala-gopher容器镜像](doc/how_to_build_docker_image.md)。
|
||
+ <a id="docker1"></a>
|
||
+ - 获取官方容器镜像
|
||
+
|
||
+ 打开docker配置文件
|
||
+
|
||
+ ```shell
|
||
+ vi /etc/docker/daemon.json
|
||
+ ```
|
||
+
|
||
+ 添加hub.oepkgs.net镜像仓库
|
||
+
|
||
+ ```shell
|
||
+ {
|
||
+ "insecure-registries" : [ "hub.oepkgs.net" ]
|
||
+ }
|
||
+ ```
|
||
+
|
||
+ 重启docker服务
|
||
+
|
||
+ ```shell
|
||
+ systemctl daemon-reload
|
||
+ systemctl restart docker
|
||
+ ```
|
||
+
|
||
+ 拉取指定版本的gala-gopher官方容器镜像
|
||
+
|
||
+ 目前支持的镜像版本tag有：euleros-v2r9，20.03-lts，20.03-lts-sp1，22.03-lts
|
||
+
|
||
+ ```shell
|
||
+ docker pull hub.oepkgs.net/a-ops/gala-gopher:20.03-lts-sp1
|
||
+ ```
|
||
+
|
||
+ <a id="docker2"></a>
|
||
+ - 构建容器镜像
|
||
+
|
||
+ 获取gala-gopher的rpm包，获取方式详见第一小节[基于rpm包安装运行](#基于rpm包安装运行)。
|
||
+
|
||
+ 用于生成容器镜像的Dockerfile文件归档在[build目录](./build)，生成方法详见[如何生成gala-gopher容器镜像](doc/how_to_build_docker_image.md)。
|
||
|
||
- 创建并运行容器
|
||
|
||
diff --git a/config/gala-gopher.conf b/config/gala-gopher.conf
|
||
index cb7fec1..33d9714 100644
|
||
--- a/config/gala-gopher.conf
|
||
+++ b/config/gala-gopher.conf
|
||
@@ -156,7 +156,9 @@ extend_probes =
|
||
name = "nsprobe";
|
||
command = "/opt/gala-gopher/extend_probes/nsprobe"
|
||
param = "";
|
||
- switch = "off";
|
||
+ start_check = "echo \"isulad docker\" | xargs systemctl status | grep Active | grep running | wc -l";
|
||
+ check_type = "count";
|
||
+ switch = "auto";
|
||
},
|
||
{
|
||
name = "ioprobe";
|
||
--
|
||
2.28.0.windows.1
|
||
|