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

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

diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml
index 0d799f1da..0aef74c07 100644
--- a/.github/workflows/images_build_windows.yml
+++ b/.github/workflows/images_build_windows.yml
@@ -89,25 +89,23 @@ jobs:
         with:
           images: ${{ env.DOCKER_REPOSITORY }}/zabbix-${{ env.BASE_BUILD_NAME }}
           tags: |
-            type=ref,event=branch,prefix=${{ matrix.os }}-
-            type=ref,event=branch,suffix=-${{ matrix.os }}
+            type=ref,event=branch,prefix=${{ matrix.build }}-${{ matrix.os }}-
+            type=ref,event=branch,suffix=-${{ matrix.os }},prefix=${{ matrix.build }}-
           flavor: |
             latest=false
 
       - name: Build ${{ env.BASE_BUILD_NAME }}/${{ matrix.build }}-${{ matrix.os }} and push
         id: docker_build
         run: |
-            $tags_array=$( "${{ steps.meta.outputs.tags}}".Split("`r`n") | Foreach-Object { "$_" } )
-            $tags=$( $tags_array -Join ',' )
+            $tags_array=$( "${{ steps.meta.outputs.tags}}".Split("`r`n") )
+            $tags=$($tags_array | Foreach-Object { "-t '$_'" }) -Join ' '
             docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-            echo "docker build --file=.\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\Dockerfile.${{ matrix.build }} -t 'zabbix/zabbix-build-base:ltsc2022-trunk' -t 'zabbix/zabbix-build-base:trunk-ltsc2022' .\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\"
-            docker build --file=.\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\Dockerfile.${{ matrix.build }} -t 'zabbix/zabbix-build-base:ltsc2022-trunk' -t 'zabbix/zabbix-build-base:trunk-ltsc2022' .\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\
+            echo "docker build --file=.\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\Dockerfile.${{ matrix.build }} $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 $tags_array[0]
             docker logout
 
-      - name: Image digest
-        run: |
-            $digest=$(docker inspect ${{ steps.meta.outputs.tags[0] }} --format "{{.Id}}")
+            $digest=$(docker inspect ${{ $tags_array[0] }} --format "{{.Id}}")
             echo $digest
             echo "$digest" > ${{ env.BASE_BUILD_NAME }}_${{ matrix.os }}_${{ matrix.build }}