diff --git a/src/agent/.gitignore b/src/agent/.gitignore index a8d8cd8..60fe090 100644 --- a/src/agent/.gitignore +++ b/src/agent/.gitignore @@ -1,3 +1,5 @@ build/ *.egg-info/ __pycache__/ + +.env diff --git a/src/agent/tests/docker-compose.yml b/src/agent/tests/docker-compose.yml index 7c151f2..618bb7a 100644 --- a/src/agent/tests/docker-compose.yml +++ b/src/agent/tests/docker-compose.yml @@ -1,6 +1,6 @@ services: bind: - image: ${BIND_IMAGE_TAG:-argus-bind9:e2e} + image: ${BIND_IMAGE_TAG:-argus-bind9:latest} container_name: argus-bind-agent-e2e volumes: - ./private:/private diff --git a/src/agent/tests/scripts/01_bootstrap.sh b/src/agent/tests/scripts/01_bootstrap.sh index cb364df..afb3d90 100755 --- a/src/agent/tests/scripts/01_bootstrap.sh +++ b/src/agent/tests/scripts/01_bootstrap.sh @@ -15,9 +15,17 @@ AGENT_HEALTH_DIR="$PRIVATE_ROOT/argus/agent/$AGENT_HOSTNAME/health" MASTER_PRIVATE_DIR="$PRIVATE_ROOT/argus/master" METRIC_PRIVATE_DIR="$PRIVATE_ROOT/argus/metric/prometheus" DNS_DIR="$PRIVATE_ROOT/argus/etc" -BIND_IMAGE_TAG="${BIND_IMAGE_TAG:-argus-bind9:e2e}" +BIND_IMAGE_TAG="${BIND_IMAGE_TAG:-argus-bind9:latest}" BIND_ROOT="$(cd "$MASTER_ROOT/../bind" && pwd)" +ensure_image() { + local image="$1" + if ! docker image inspect "$image" >/dev/null 2>&1; then + echo "[ERROR] Docker image '$image' 未找到,请先运行统一构建脚本 (例如 ./build/build_images.sh) 生成所需镜像" >&2 + exit 1 + fi +} + mkdir -p "$AGENT_CONFIG_DIR" mkdir -p "$AGENT_HEALTH_DIR" mkdir -p "$MASTER_PRIVATE_DIR" @@ -35,9 +43,8 @@ else echo "[WARN] bind update script missing at $BIND_ROOT/build/update-dns.sh" fi -pushd "$MASTER_ROOT" >/dev/null -./scripts/build_images.sh --tag argus-master:dev -popd >/dev/null +ensure_image "argus-master:dev" +ensure_image "$BIND_IMAGE_TAG" AGENT_BINARY="$AGENT_ROOT/dist/argus-agent" @@ -50,11 +57,6 @@ if [[ ! -x "$AGENT_BINARY" ]]; then exit 1 fi -# 中文提示:构建测试专用 bind9 镜像,确保解析服务可用 -pushd "$REPO_ROOT" >/dev/null -docker build -f src/bind/build/Dockerfile -t "$BIND_IMAGE_TAG" . -popd >/dev/null - echo "$AGENT_BINARY" > "$TMP_ROOT/agent_binary_path" echo "$BIND_IMAGE_TAG" > "$TMP_ROOT/bind_image_tag" diff --git a/src/agent/tests/scripts/02_up.sh b/src/agent/tests/scripts/02_up.sh index 2d9de25..56c4cda 100755 --- a/src/agent/tests/scripts/02_up.sh +++ b/src/agent/tests/scripts/02_up.sh @@ -28,7 +28,7 @@ if [[ ! -x "$AGENT_BINARY" ]]; then exit 1 fi -BIND_IMAGE_TAG_VALUE="argus-bind9:e2e" +BIND_IMAGE_TAG_VALUE="argus-bind9:latest" if [[ -f "$TMP_ROOT/bind_image_tag" ]]; then BIND_IMAGE_TAG_VALUE="$(cat "$TMP_ROOT/bind_image_tag")" fi