From 0211760a8810c75319b0c25dba214fd149945cd9 Mon Sep 17 00:00:00 2001
From: yuyr <yuyr@zgclab.edu.cn>
Date: Sun, 28 Sep 2025 15:39:12 +0800
Subject: [PATCH] =?UTF-8?q?[#7]=20=E6=B5=8B=E8=AF=95lm2=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E7=AB=AF=E5=88=B0=E7=AB=AF=E6=B5=8B=E8=AF=95=EF=BC=8C=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agent/tests/docker-compose.yml                         | 2 +-
 src/agent/tests/scripts/06_restart_agent_and_reregister.sh | 2 +-
 src/bind/tests/scripts/01_start_container.sh               | 5 +++--
 src/log/tests/docker-compose.yml                           | 3 ---
 src/log/tests/scripts/01_bootstrap.sh                      | 6 +++---
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/agent/tests/docker-compose.yml b/src/agent/tests/docker-compose.yml
index 6fa9e4b..7c151f2 100644
--- a/src/agent/tests/docker-compose.yml
+++ b/src/agent/tests/docker-compose.yml
@@ -34,7 +34,7 @@ services:
         ipv4_address: 172.28.0.10
 
   agent:
-    image: ubuntu:24.04
+    image: ubuntu:22.04
     container_name: argus-agent-e2e
     hostname: dev-e2euser-e2einst-pod-0
     depends_on:
diff --git a/src/agent/tests/scripts/06_restart_agent_and_reregister.sh b/src/agent/tests/scripts/06_restart_agent_and_reregister.sh
index 75731ed..830f573 100755
--- a/src/agent/tests/scripts/06_restart_agent_and_reregister.sh
+++ b/src/agent/tests/scripts/06_restart_agent_and_reregister.sh
@@ -81,7 +81,7 @@ if ! docker run -d \
   -e MASTER_ENDPOINT=http://master.argus.com:3000 \
   -e REPORT_INTERVAL_SECONDS=2 \
   --entrypoint /usr/local/bin/agent-entrypoint.sh \
-  ubuntu:24.04 >/dev/null; then
+  ubuntu:22.04 >/dev/null; then
   echo "[ERROR] Failed to start agent container with custom IP" >&2
   exit 1
 fi
diff --git a/src/bind/tests/scripts/01_start_container.sh b/src/bind/tests/scripts/01_start_container.sh
index 2a501b9..210be89 100755
--- a/src/bind/tests/scripts/01_start_container.sh
+++ b/src/bind/tests/scripts/01_start_container.sh
@@ -13,7 +13,8 @@ cd "$TEST_DIR"
 echo "Starting BIND9 test container..."
 
 # Ensure private directory exists with proper permissions
-mkdir -p private
+mkdir -p private/argus/bind
+mkdir -p private/argus/etc
 chmod 777 private
 
 # Start the container
@@ -35,4 +36,4 @@ fi
 
 echo ""
 echo "BIND9 test environment is ready!"
-echo "DNS server listening on localhost:53"
\ No newline at end of file
+echo "DNS server listening on localhost:53"
diff --git a/src/log/tests/docker-compose.yml b/src/log/tests/docker-compose.yml
index 4f2c7fe..7fc75c5 100644
--- a/src/log/tests/docker-compose.yml
+++ b/src/log/tests/docker-compose.yml
@@ -76,9 +76,6 @@ services:
 
   bind9:
       image: argus-bind9:latest
-      ports:
-        - "53:53/tcp"
-        - "53:53/udp"
       volumes:
         - ./private/argus:/private/argus/
       restart: unless-stopped
diff --git a/src/log/tests/scripts/01_bootstrap.sh b/src/log/tests/scripts/01_bootstrap.sh
index e45fde3..93898e0 100755
--- a/src/log/tests/scripts/01_bootstrap.sh
+++ b/src/log/tests/scripts/01_bootstrap.sh
@@ -15,9 +15,9 @@ mkdir -p "$root/private/argus/etc/"
 
 # 设置数据目录权限（ES 和 Kibana 容器都使用 UID 1000）
 echo "[INFO] Setting permissions for data directories..."
-sudo chown -R "${ARGUS_BUILD_UID}:${ARGUS_BUILD_GID}" "$root/private/argus/log/elasticsearch" 2>/dev/null || true
-sudo chown -R "${ARGUS_BUILD_UID}:${ARGUS_BUILD_GID}" "$root/private/argus/log/kibana" 2>/dev/null || true
-sudo chown -R "${ARGUS_BUILD_UID}:${ARGUS_BUILD_GID}" "$root/private/argus/etc" 2>/dev/null || true
+chown -R "${ARGUS_BUILD_UID}:${ARGUS_BUILD_GID}" "$root/private/argus/log/elasticsearch" 2>/dev/null || true
+chown -R "${ARGUS_BUILD_UID}:${ARGUS_BUILD_GID}" "$root/private/argus/log/kibana" 2>/dev/null || true
+chown -R "${ARGUS_BUILD_UID}:${ARGUS_BUILD_GID}" "$root/private/argus/etc" 2>/dev/null || true
 
 echo "[INFO] Supervisor-based containers will manage their own scripts and configurations"