From b018df4502ceb9790e8a19aa3207bdb80f53229a Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Sat, 10 Feb 2024 04:41:00 +0900
Subject: [PATCH] Prepare universal workflow

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

diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml
index e5fc9c6e8..4068d1a68 100644
--- a/.github/workflows/images_build_windows.yml
+++ b/.github/workflows/images_build_windows.yml
@@ -20,9 +20,9 @@ defaults:
     shell: pwsh
 
 env:
-  AUTO_PUSH_IMAGES: ${{ secrets.AUTO_PUSH_IMAGES }}
+  AUTO_PUSH_IMAGES: ${{ vars.AUTO_PUSH_IMAGES }}
 
-  DOCKER_REPOSITORY: "zabbix"
+  DOCKER_REPOSITORY: ${{ vars.DOCKER_REPOSITORY }}
   LATEST_BRANCH: ${{ github.event.repository.default_branch }}
   IMAGES_PREFIX: "zabbix-"
 
@@ -680,21 +680,26 @@ jobs:
             # PowerShell images based on LTSC 2019 and LTSC 2016 do not have "ltsc" prefix
             $os_tag_suffix=$Env:BASE_BUILD_OS_TAG
             $os_tag_suffix=$os_tag_suffix -replace "ltsc2019",'1809'
+            $base_image=$Env:PWSH_BASE_IMAGE_NAME + ':' + $Env:PWSH_BASE_IMAGE_PREFIX + $os_tag_suffix
 
             echo "::group::Image tags"
             echo "$Env:TAGS"
             echo "::endgroup::"
-            echo "::group::Pull base image"
+            echo "::group::Pull build base image"
             docker pull $base_build_image
             if (-not $?) {throw "Failed"}
             echo "::endgroup::"
+            echo "::group::Pull Powershell base image"
+            docker pull $base_image
+            if (-not $?) {throw "Failed"}
+            echo "::endgroup::"
 
             echo "::group::Build Image"
             Write-Host @"
             docker build --label org.opencontainers.image.revision=$Env:LABEL_REVISION
                          --label org.opencontainers.image.created=$Env:LABEL_CREATED
                          --build-arg=BUILD_BASE_IMAGE=$base_build_image
-                         --build-arg=BASE_IMAGE=$Env:PWSH_BASE_IMAGE_NAME:$Env:PWSH_BASE_IMAGE_PREFIX$os_tag_suffix
+                         --build-arg=BASE_IMAGE=$base_image
                          --file=$dockerfile
                          $tags
                     $context
@@ -703,7 +708,7 @@ jobs:
             docker build --label org.opencontainers.image.revision=$Env:LABEL_REVISION `
                          --label org.opencontainers.image.created=$Env:LABEL_CREATED `
                          --build-arg=BUILD_BASE_IMAGE=$base_build_image `
-                         --build-arg=BASE_IMAGE=$Env:PWSH_BASE_IMAGE_NAME:$Env:PWSH_BASE_IMAGE_PREFIX$os_tag_suffix `
+                         --build-arg=BASE_IMAGE=$base_image `
                          --file=$dockerfile `
                          $tags `
                     $context