From 5d84a982dbb95064d706a427c285531288fc6738 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Fri, 8 Oct 2021 19:16:47 +0200
Subject: [PATCH] Updated build script

---
 .github/workflows/images_build_windows.yml | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml
index 9db193ec2..bc901c4df 100644
--- a/.github/workflows/images_build_windows.yml
+++ b/.github/workflows/images_build_windows.yml
@@ -100,8 +100,8 @@ jobs:
             docker build --file=.\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\Dockerfile.${{ matrix.build }} $tags .\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\
             if (-not $?) {throw "Failed"}
 
-            Foreach ($tag in $test2) {
-                echo "docker push image push --all-tags $tag"
+            Foreach ($tag in $tags_array) {
+                echo "docker image push $tag"
                 docker image push $tag
                 if (-not $?) {throw "Failed"}
             }
@@ -123,7 +123,7 @@ jobs:
   build_base_database:
     timeout-minutes: 70
     needs: [ "build_base", "init_build"]
-    name: Build ${{ matrix.build }} base on ${{ matrix.os }}
+    name: Build ${{ matrix.build }} sources on ${{ matrix.os }}
     strategy:
       fail-fast: false  
       matrix:
@@ -135,18 +135,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2.3.4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1 
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
       - name: Generate tags
         id: meta
         uses: docker/metadata-action@v3
@@ -177,7 +165,6 @@ jobs:
         run: |
             $tags_array=$( "${{ steps.meta.outputs.tags}}".Split("`r`n") )
             $tags=$($tags_array | Foreach-Object { "--tag=$_" })
-            $tags_list=$($tags_array -Join ' ')
 
             docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
             if (-not $?) {throw "Failed"}
@@ -186,7 +173,7 @@ jobs:
             docker build --build-arg=BUILD_BASE_IMAGE=${{ steps.base_build.outputs.base_build_image }} --file=.\Dockerfiles\build-mysql\windows\Dockerfile.${{ matrix.build }} $tags .\Dockerfiles\build-mysql\windows\
             if (-not $?) {throw "Failed"}
 
-            Foreach ($tag in $test2) {
+            Foreach ($tag in $tags_array) {
                 docker image push $tag
                 if (-not $?) {throw "Failed"}
             }