[#49] 增加no bind版本server & client pkg, 完成h20 部署测试和重启测试

build/build_images.sh

@@ -40,6 +40,8 @@ build_gpu_bundle=false
 build_cpu_bundle=false
 build_server_pkg=false
 build_client_pkg=false
+need_bind_image=true
+need_metric_ftp=true
 no_cache=false
 
 bundle_date=""
@@ -124,6 +126,11 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+if [[ "$build_server_pkg" == true ]]; then
+  need_bind_image=false
+  need_metric_ftp=false
+fi
+
 root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 . "$root/scripts/common/build_user.sh"
 
@@ -463,11 +470,11 @@ build_server_pkg_bundle() {
     return 1
   fi
   local repos=(
-    argus-bind9 argus-master argus-elasticsearch argus-kibana \
-    argus-metric-ftp argus-metric-prometheus argus-metric-grafana \
+    argus-master argus-elasticsearch argus-kibana \
+    argus-metric-prometheus argus-metric-grafana \
     argus-alertmanager argus-web-frontend argus-web-proxy
   )
-  echo "\n🔖 Verifying server images with :$date_tag and collecting digests"
+  echo "\n🔖 Verifying server images with :$date_tag and collecting digests (Bind/FTP excluded; relying on Docker DNS aliases)"
   for repo in "${repos[@]}"; do
     if ! docker image inspect "$repo:$date_tag" >/dev/null 2>&1; then
       echo "❌ required image missing: $repo:$date_tag (build phase should have produced it)" >&2
@@ -638,10 +645,12 @@ if [[ "$build_core" == true ]]; then
 
   echo ""
 
-  if build_image "BIND9" "src/bind/build/Dockerfile" "argus-bind9:${DEFAULT_IMAGE_TAG}"; then
-    images_built+=("argus-bind9:${DEFAULT_IMAGE_TAG}")
-  else
-    build_failed=true
+  if [[ "$need_bind_image" == true ]]; then
+    if build_image "BIND9" "src/bind/build/Dockerfile" "argus-bind9:${DEFAULT_IMAGE_TAG}"; then
+      images_built+=("argus-bind9:${DEFAULT_IMAGE_TAG}")
+    else
+      build_failed=true
+    fi
   fi
 fi
 
@@ -678,19 +687,25 @@ if [[ "$build_metric" == true ]]; then
   echo "Building Metric module images..."
 
   metric_base_images=(
-    "ubuntu:22.04"
     "ubuntu/prometheus:3-24.04_stable"
     "grafana/grafana:11.1.0"
   )
 
+  if [[ "$need_metric_ftp" == true ]]; then
+    metric_base_images+=("ubuntu:22.04")
+  fi
+
   for base_image in "${metric_base_images[@]}"; do
     if ! pull_base_image "$base_image"; then
       build_failed=true
     fi
   done
 
-  metric_builds=(
-    "Metric FTP|src/metric/ftp/build/Dockerfile|argus-metric-ftp:${DEFAULT_IMAGE_TAG}|src/metric/ftp/build"
+  metric_builds=()
+  if [[ "$need_metric_ftp" == true ]]; then
+    metric_builds+=("Metric FTP|src/metric/ftp/build/Dockerfile|argus-metric-ftp:${DEFAULT_IMAGE_TAG}|src/metric/ftp/build")
+  fi
+  metric_builds+=(
     "Metric Prometheus|src/metric/prometheus/build/Dockerfile|argus-metric-prometheus:${DEFAULT_IMAGE_TAG}|src/metric/prometheus/build"
     "Metric Grafana|src/metric/grafana/build/Dockerfile|argus-metric-grafana:${DEFAULT_IMAGE_TAG}|src/metric/grafana/build"
   )