From 3dfa69c91f3ecd6171e0572771381edad6c5fe99 Mon Sep 17 00:00:00 2001
From: Monet Lee <monet_lee@163.com>
Date: Tue, 3 Dec 2024 14:35:14 +0800
Subject: [PATCH] upd

---
 .github/workflows/docker-build.yml | 44 ++++++++++++++++++------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 35cccdf..e88b077 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -83,22 +83,30 @@ jobs:
       - name: Build and push Docker images
         run: |
           ROOT_DIR="build/images"
-          while IFS= read -r tag; do
-              for dir in "$ROOT_DIR"/*/; do
-                  # Find Dockerfile or *.dockerfile in a case-insensitive manner
-                  dockerfile=$(find "$dir" -maxdepth 1 -type f \( -iname 'dockerfile' -o -iname '*.dockerfile' \) | head -n 1)
+          for dir in "$ROOT_DIR"/*/; do
+              # Find Dockerfile or *.dockerfile in a case-insensitive manner
+              dockerfile=$(find "$dir" -maxdepth 1 -type f \( -iname 'dockerfile' -o -iname '*.dockerfile' \) | head -n 1)
+              
+              if [ -n "$dockerfile" ] && [ -f "$dockerfile" ]; then
+                  IMAGE_NAME=$(basename "$dir")
+                  echo "Building Docker image for $IMAGE_NAME with tags:"
                   
-                  if [ -n "$dockerfile" ] && [ -f "$dockerfile" ]; then
-                      IMAGE_NAME=$(basename "$dir")
-                      echo "Building Docker image for $IMAGE_NAME with tag $tag..."
-                      docker buildx build --platform linux/amd64,linux/arm64 \
-                        --file "$dockerfile" \
-                        --tag ${{ secrets.DOCKER_USERNAME }}/$IMAGE_NAME:"$tag" \
-                        --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:"$tag" \
-                        --tag registry.cn-hangzhou.aliyuncs.com/openimsdk/$IMAGE_NAME:"$tag" \
-                        --push "$dir"
-                  else
-                      echo "No valid Dockerfile found in $dir"
-                  fi
-              done
-          done <<< "${{ steps.meta.outputs.tags }}"
\ No newline at end of file
+                  # Initialize tag arguments
+                  tag_args=()
+  
+                  # Read each tag and append --tag arguments
+                  while IFS= read -r tag; do
+                      tag_args+=(--tag "${{ secrets.DOCKER_USERNAME }}/$IMAGE_NAME:$tag")
+                      tag_args+=(--tag "ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:$tag")
+                      tag_args+=(--tag "registry.cn-hangzhou.aliyuncs.com/openimsdk/$IMAGE_NAME:$tag")
+                  done <<< "${{ steps.meta.outputs.tags }}"
+  
+                  # Build and push the Docker image with all tags
+                  docker buildx build --platform linux/amd64,linux/arm64 \
+                    --file "$dockerfile" \
+                    "${tag_args[@]}" \
+                    --push "$dir"
+              else
+                  echo "No valid Dockerfile found in $dir"
+              fi
+          done
\ No newline at end of file