dev_1.0.0_yuyr_2:重新提交 PR,增加 master/agent 以及系统集成测试 #17

Merged
yuyr merged 26 commits from dev_1.0.0_yuyr_2 into dev_1.0.0 2025-10-11 15:04:47 +08:00
2 changed files with 6 additions and 2 deletions
Showing only changes of commit e133d007f3 - Show all commits

View File

@ -4,13 +4,13 @@ services:
container_name: argus-bind-agent-e2e container_name: argus-bind-agent-e2e
volumes: volumes:
- ./private:/private - ./private:/private
restart: unless-stopped
networks: networks:
default: default:
ipv4_address: 172.28.0.2 ipv4_address: 172.28.0.2
environment: environment:
- "ARGUS_BUILD_UID=${ARGUS_BUILD_UID:-2133}" - "ARGUS_BUILD_UID=${ARGUS_BUILD_UID:-2133}"
- "ARGUS_BUILD_GID=${ARGUS_BUILD_GID:-2015}" - "ARGUS_BUILD_GID=${ARGUS_BUILD_GID:-2015}"
restart: always
master: master:
image: argus-master:latest image: argus-master:latest
@ -32,6 +32,7 @@ services:
networks: networks:
default: default:
ipv4_address: 172.28.0.10 ipv4_address: 172.28.0.10
restart: always
agent: agent:
image: ubuntu:22.04 image: ubuntu:22.04
@ -57,6 +58,7 @@ services:
networks: networks:
default: default:
ipv4_address: 172.28.0.20 ipv4_address: 172.28.0.20
restart: always
networks: networks:
default: default:

View File

@ -17,6 +17,7 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 30 retries: 30
restart: always
kibana: kibana:
build: build:
@ -73,10 +74,11 @@ services:
interval: 15s interval: 15s
timeout: 10s timeout: 10s
retries: 30 retries: 30
restart: always
bind9: bind9:
image: argus-bind9:latest image: argus-bind9:latest
volumes: volumes:
- ./private/argus:/private/argus/ - ./private/argus:/private/argus/
restart: unless-stopped restart: always