Browse Source

add AGENT docker. (#22)

* feat: add agent docker.

* update: agent quickstart markdown.
Yang Shuang 2 years ago
parent
commit
26d970cf44
5 changed files with 18 additions and 3 deletions
  1. 1 0
      .travis.yml
  2. 1 1
      dockerfiles/agent/dockerfile
  3. 1 1
      dockerfiles/server/dockerfile
  4. 11 1
      docs/quickstart.md
  5. 4 0
      src/agent/da.c

+ 1 - 0
.travis.yml

@@ -39,6 +39,7 @@ after_success:
 - cp build/src/agent/dtcagent dockerfiles/agent/
 - cp conf/agent.xml dockerfiles/agent/
 - cp build/src/connector/connector dockerfiles/server/
+
 - cd dockerfiles/server/
 - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 

+ 1 - 1
dockerfiles/agent/dockerfile

@@ -11,4 +11,4 @@ RUN mkdir -p $logpath
 COPY dtcagent $basepath/bin/dtcagent
 COPY agent.xml $confpath/agent.xml
 
-CMD ["/usr/local/dtc/bin/dtcagent"]
+CMD ["/usr/local/dtc/bin/dtcagent","-v","7"]

+ 1 - 1
dockerfiles/server/dockerfile

@@ -16,4 +16,4 @@ COPY table.yaml $confpath/table.yaml
 COPY dtc.yaml $confpath/dtc.yaml
 COPY log4cplus.conf $confpath/log4cplus.conf
 
-CMD ["/usr/local/dtc/bin/dtcd", "-d"]
+CMD ["/usr/local/dtc/bin/dtcd", "-d"]

+ 11 - 1
docs/quickstart.md

@@ -23,7 +23,7 @@ demo中定义的表名为dtc_opensource, <br/>
 | sex    | 整型                   | 4 Byte  |
 | age    | 整型                   | 4 Byte  |
 
-## 启动Server端
+## 启动DTC Server端
 为了省去配置环境的麻烦,Demo中提供docker镜像,直接运行即可启动服务端:<br/>
   ```shell
   docker pull dtc8/server:latest
@@ -34,6 +34,16 @@ demo中定义的表名为dtc_opensource, <br/>
   docker rm dtc-server
   ```
 
+## 启动Agent端
+  在docker环境中,agent和dtc-server需要在同一个网络环境中才能相互通信,故在启动时使用--network=container参数。
+  ```shell
+  docker pull dtc8/agent:latest
+  docker run -i -t --name agent --network=container:dtc-server dtc8/agent:latest
+  ```
+如非首次运行容器,则有可能会提示容器已存在,删除旧容器即可:
+  ```shell
+  docker rm agent
+  ```
 ## 运行Client测试示例
 client测试示例在server容器当中,进入容器:
   ```shell

+ 4 - 0
src/agent/da.c

@@ -472,6 +472,9 @@ static int da_pre_run(struct instance *dai) {
 	tv_update_date(-1, -1);
 	//init log
 	da_log_init(dai);
+
+	log_info("DTC AGENT init.");
+
 	if (daemonize) {
 		status = da_daemonize(1);
 		if (status != 0) {
@@ -646,6 +649,7 @@ int main(int argc, char **argv) {
 		}
 		exit(0);
 	}
+
 	status = da_pre_run(&dai);
 	if (status < 0) {
 		da_post_run(&dai);