[#7] 测试lm2部署端到端测试,部分修复
This commit is contained in:
parent
abbef0ca71
commit
86b691afbb
@ -34,7 +34,7 @@ services:
|
|||||||
ipv4_address: 172.28.0.10
|
ipv4_address: 172.28.0.10
|
||||||
|
|
||||||
agent:
|
agent:
|
||||||
image: ubuntu:24.04
|
image: ubuntu:22.04
|
||||||
container_name: argus-agent-e2e
|
container_name: argus-agent-e2e
|
||||||
hostname: dev-e2euser-e2einst-pod-0
|
hostname: dev-e2euser-e2einst-pod-0
|
||||||
depends_on:
|
depends_on:
|
||||||
|
@ -81,7 +81,7 @@ if ! docker run -d \
|
|||||||
-e MASTER_ENDPOINT=http://master.argus.com:3000 \
|
-e MASTER_ENDPOINT=http://master.argus.com:3000 \
|
||||||
-e REPORT_INTERVAL_SECONDS=2 \
|
-e REPORT_INTERVAL_SECONDS=2 \
|
||||||
--entrypoint /usr/local/bin/agent-entrypoint.sh \
|
--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
|
echo "[ERROR] Failed to start agent container with custom IP" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -13,7 +13,8 @@ cd "$TEST_DIR"
|
|||||||
echo "Starting BIND9 test container..."
|
echo "Starting BIND9 test container..."
|
||||||
|
|
||||||
# Ensure private directory exists with proper permissions
|
# Ensure private directory exists with proper permissions
|
||||||
mkdir -p private
|
mkdir -p private/argus/bind
|
||||||
|
mkdir -p private/argus/etc
|
||||||
chmod 777 private
|
chmod 777 private
|
||||||
|
|
||||||
# Start the container
|
# Start the container
|
||||||
|
@ -76,9 +76,6 @@ services:
|
|||||||
|
|
||||||
bind9:
|
bind9:
|
||||||
image: argus-bind9:latest
|
image: argus-bind9:latest
|
||||||
ports:
|
|
||||||
- "53:53/tcp"
|
|
||||||
- "53:53/udp"
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./private/argus:/private/argus/
|
- ./private/argus:/private/argus/
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
@ -15,9 +15,9 @@ mkdir -p "$root/private/argus/etc/"
|
|||||||
|
|
||||||
# 设置数据目录权限(ES 和 Kibana 容器都使用 UID 1000)
|
# 设置数据目录权限(ES 和 Kibana 容器都使用 UID 1000)
|
||||||
echo "[INFO] Setting permissions for data directories..."
|
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
|
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
|
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/etc" 2>/dev/null || true
|
||||||
|
|
||||||
echo "[INFO] Supervisor-based containers will manage their own scripts and configurations"
|
echo "[INFO] Supervisor-based containers will manage their own scripts and configurations"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user