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

---
 .github/workflows/images_build_windows.yml       | 9 ++-------
 Dockerfiles/build-base/windows/Dockerfile.agent2 | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml
index 2fe75d9fc..43d8e84d8 100644
--- a/.github/workflows/images_build_windows.yml
+++ b/.github/workflows/images_build_windows.yml
@@ -77,12 +77,6 @@ jobs:
         with:
           fetch-depth: 1
 
-      - 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
@@ -105,7 +99,8 @@ jobs:
             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]
+            echo "docker push image push --all-tags $tags_array[0]"
+            docker image push --all-tags $tags_array[0]
             docker logout
 
             $digest=$(docker inspect $tags_array[0] --format "{{.Id}}")
diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2
index ce6a59ed5..ca6293423 100644
--- a/Dockerfiles/build-base/windows/Dockerfile.agent2
+++ b/Dockerfiles/build-base/windows/Dockerfile.agent2
@@ -114,6 +114,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     `
     Write-Host ('Downloading {0} ...' -f $env:MINGW_URL); `
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
+    [System.Net.ServicePointManager]::ServerCertificateValidationCallback = { $true }; `
     Invoke-WebRequest -OutFile $env:SystemDrive\mingw.7z -Uri $env:MINGW_URL; `
     `
     $sha256 = 'e8c65ddc655534b0330f66f7b480565621e8617cda9937d76ba141a22bf3b2fa'; `