From 485a8a3318769c509ecdd876b43e74bcb0df3488 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 13 May 2024 18:24:14 +0900
Subject: [PATCH] Allowed to use custom branch

---
 Dockerfiles/build-mysql/windows/Dockerfile.agent  | 2 +-
 Dockerfiles/build-mysql/windows/Dockerfile.agent2 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent
index dae5487ca..d73999b5f 100644
--- a/Dockerfiles/build-mysql/windows/Dockerfile.agent
+++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent
@@ -27,7 +27,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 
 RUN Set-Location -Path $env:SystemDrive\.; `
     `
-    $GIT_BRANCH = $env:GIT_BRANCH ?? $env:ZBX_VERSION `
+    $GIT_BRANCH = if { $env:GIT_BRANCH } { $env:GIT_BRANCH } { $env:ZBX_VERSION } `
     `
     Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); `
     Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile.agent2
index 276b7c2e8..b555a050b 100644
--- a/Dockerfiles/build-mysql/windows/Dockerfile.agent2
+++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent2
@@ -30,9 +30,9 @@ LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" `
 
 RUN Set-Location -Path $env:SystemDrive\.; `
     `
-    $GIT_BRANCH = $env:GIT_BRANCH ?? $env:ZBX_VERSION `
-    $MONGODB_PLUGIN_VERSION = $env:MONGODB_PLUGIN_VERSION ?? $env:ZBX_VERSION `
-    $POSTGRESQL_PLUGIN_VERSION = $env:POSTGRESQL_PLUGIN_VERSION ?? $env:ZBX_VERSION `
+    $GIT_BRANCH = if { $env:GIT_BRANCH } { $env:GIT_BRANCH } { $env:ZBX_VERSION } `
+    $MONGODB_PLUGIN_VERSION = if { $env:MONGODB_PLUGIN_VERSION } { $env:MONGODB_PLUGIN_VERSION } { $env:ZBX_VERSION } `
+    $POSTGRESQL_PLUGIN_VERSION = if { $env:POSTGRESQL_PLUGIN_VERSION } { $env:POSTGRESQL_PLUGIN_VERSION } { $env:ZBX_VERSION } `
     `
     Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); `
     Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `