Merge pull request #1368 from zabbix/trunk_lic

Allowed to use custom branch
zabbix · May 13, 2024 · 70a7023 · 70a7023
2 parents 2bf4c38 + 51f6265
commit 70a7023
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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 = if ( $env:GIT_BRANCH ) { $env:GIT_BRANCH } { $env:ZBX_VERSION } `
+    $GIT_BRANCH = if ( $env:GIT_BRANCH ) { $env:GIT_BRANCH } else { $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
@@ -30,9 +30,9 @@ LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" `
 
 RUN Set-Location -Path $env:SystemDrive\.; `
     `
-    $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 } `
+    $GIT_BRANCH = if ( $env:GIT_BRANCH ) { $env:GIT_BRANCH } else { $env:ZBX_VERSION }; `
+    $MONGODB_PLUGIN_VERSION = if ( $env:MONGODB_PLUGIN_VERSION ) { $env:MONGODB_PLUGIN_VERSION } else { $env:ZBX_VERSION }; `
+    $POSTGRESQL_PLUGIN_VERSION = if ( $env:POSTGRESQL_PLUGIN_VERSION ) { $env:POSTGRESQL_PLUGIN_VERSION } else { $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"""; `