[#29] 整合metric模块端到端测试跑通；整合web/alert模块镜像构建

src/web/build_tools/proxy/Dockerfile

@@ -8,24 +8,34 @@ RUN apt-get update && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ENV FRONTEND_BASE_PATH=/private/argus/web/proxy
-ARG ARGUS_UID=2133
-ARG ARGUS_GID=2015
-ENV ARGUS_UID=${ARGUS_UID}
-ENV ARGUS_GID=${ARGUS_GID}
+ARG ARGUS_BUILD_UID=2133
+ARG ARGUS_BUILD_GID=2015
+ENV ARGUS_BUILD_UID=${ARGUS_BUILD_UID}
+ENV ARGUS_BUILD_GID=${ARGUS_BUILD_GID}
 
 RUN mkdir -p ${FRONTEND_BASE_PATH} && \
     mkdir -p /private/argus/etc
 
 # 创建 proxy 用户（可自定义 UID/GID）
 # 创建 proxy 用户组
-RUN groupadd -g ${ARGUS_GID} web_proxy
-
-# 创建 proxy 用户并指定组
-RUN useradd -M -s /usr/sbin/nologin -u ${ARGUS_UID} -g ${ARGUS_GID} web_proxy
-
-RUN chown -R web_proxy:web_proxy ${FRONTEND_BASE_PATH} && \
-    chown -R web_proxy:web_proxy /private/argus/etc && \
-    chown -R web_proxy:web_proxy /usr/local/bin
+RUN set -eux; \
+    if ! getent group "${ARGUS_BUILD_GID}" >/dev/null; then \
+        groupadd -g "${ARGUS_BUILD_GID}" web_proxy || true; \
+    fi; \
+    if id web_proxy >/dev/null 2>&1; then \
+        current_uid="$(id -u web_proxy)"; \
+        if [ "$current_uid" != "${ARGUS_BUILD_UID}" ] && ! getent passwd "${ARGUS_BUILD_UID}" >/dev/null; then \
+            usermod -u "${ARGUS_BUILD_UID}" web_proxy; \
+        fi; \
+        usermod -g "${ARGUS_BUILD_GID}" web_proxy || true; \
+    else \
+        if ! getent passwd "${ARGUS_BUILD_UID}" >/dev/null; then \
+            useradd -M -s /usr/sbin/nologin -u "${ARGUS_BUILD_UID}" -g "${ARGUS_BUILD_GID}" web_proxy; \
+        else \
+            echo "UID ${ARGUS_BUILD_UID} already exists; skip creating user 'web_proxy'"; \
+        fi; \
+    fi; \
+    chown -R "${ARGUS_BUILD_UID}:${ARGUS_BUILD_GID}" ${FRONTEND_BASE_PATH} /private/argus/etc /usr/local/bin || true
 
 # 配置内网 apt 源 (如果指定了内网选项)
 RUN if [ "$USE_INTRANET" = "true" ]; then \

src/web/build_tools/proxy/build.sh

@@ -3,7 +3,7 @@ docker pull ubuntu:24.04
 source src/web/tests/.env
 
 docker build \
-    --build-arg ARGUS_UID=${ARGUS_UID} \
-    --build-arg ARGUS_GID=${ARGUS_GID} \
+    --build-arg ARGUS_BUILD_UID=${ARGUS_BUILD_UID} \
+    --build-arg ARGUS_BUILD_GID=${ARGUS_BUILD_GID} \
     -f src/web/build_tools/proxy/Dockerfile -t argus-web-proxy:latest .
 docker save -o argus-web-proxy-latest.tar argus-web-proxy:latest

src/web/build_tools/proxy/start-proxy-supervised.sh

@@ -9,8 +9,8 @@ DNS_CONF_PRIVATE="/private/argus/etc/dns.conf"
 DNS_CONF_SYSTEM="/etc/resolv.conf"
 DNS_DIR="/private/argus/etc"
 DNS_SCRIPT="${DNS_DIR}/update-dns.sh"
-RUNTIME_UID="${ARGUS_UID:-2133}"
-RUNTIME_GID="${ARGUS_GID:-2015}"
+RUNTIME_UID="${ARGUS_BUILD_UID:-2133}"
+RUNTIME_GID="${ARGUS_BUILD_GID:-2015}"
 
 mkdir -p "$DNS_DIR"
 chown -R "$RUNTIME_UID:$RUNTIME_GID" "$DNS_DIR" 2>/dev/null || true