From 44b4bc16de1de1b2d52c372e9eab79fcb3e73a33 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Fri, 8 Oct 2021 15:23:28 +0200
Subject: [PATCH] Updated build script

---
 .github/workflows/images_build_windows.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml
index 316543b41..cbe750187 100644
--- a/.github/workflows/images_build_windows.yml
+++ b/.github/workflows/images_build_windows.yml
@@ -96,14 +96,10 @@ jobs:
       - name: Build ${{ env.BASE_BUILD_NAME }}/${{ matrix.build }}-${{ matrix.os }} and push
         id: docker_build
         run: |
-            $tags='${{ steps.meta.outputs.tags }}'
-            $result_tags = ''
-            foreach ($line in $tags) {
-                $result_tags = $result_tags + ' --tag=' + $line
-            }
-            echo $result_tags
+            $tags=$(echo "steps.meta.outputs.tags"  | jq --raw-input . | jq --slurp . | jq -r '. | map("""--tag=""" + .) | join(""" """)')
+            echo $tags
             docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-            docker build --file=.\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\Dockerfile.${{ matrix.build }} $result_tags .\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\
+            docker build --file=.\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\Dockerfile.${{ matrix.build }} $tags .\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\
             docker push image push --all-tags ${{ steps.meta.outputs.tags[0] }}
             docker logout