extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-12-24 23:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1366 from zabbix/trunk_arg_branch

Browse Source 
Allowed to use custom branch
This commit is contained in:
Alexey Pustovalov 2024-05-13 18:24:48 +09:00 committed by GitHub
commit db92aeb20d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/build-mysql/windows/Dockerfile.agent
View File

@ -27,7 +27,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
RUN Set-Location -Path $env:SystemDrive\.; ` 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)} ); ` 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"""; ` Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `

6
Dockerfiles/build-mysql/windows/Dockerfile.agent2
View File

@ -30,9 +30,9 @@ LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" `
RUN Set-Location -Path $env:SystemDrive\.; ` 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 } `
$MONGODB_PLUGIN_VERSION = $env:MONGODB_PLUGIN_VERSION ?? $env:ZBX_VERSION ` $MONGODB_PLUGIN_VERSION = if { $env:MONGODB_PLUGIN_VERSION } { $env:MONGODB_PLUGIN_VERSION } { $env:ZBX_VERSION } `
$POSTGRESQL_PLUGIN_VERSION = $env:POSTGRESQL_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)} ); ` 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"""; ` Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `