Snarp/zabbix
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Optimize agents build on Windows

Browse source
This commit is contained in:
Alexey Pustovalov 2026-04-25 00:47:39 +09:00
parent 07284f840d
commit 6888e54e9a
4 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Dockerfiles/build-base/windows/Dockerfile.agent
View file

@ -102,6 +102,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
Write-Host 'Extracting OpenSSL archive ...'; `
tar -zxf $env:BUILD_SRC\openssl.tar.gz; `
Rename-Item -Path $env:BUILD_SRC\openssl-$env:OPENSSL_VERSION -NewName $env:BUILD_SRC\openssl; `
Remove-Item -Recurse -Force $env:BUILD_SRC\openssl\test -ErrorAction SilentlyContinue; `
`
Write-Host 'Extracting Libmodbus archive ...'; `
tar -zxf $env:BUILD_SRC\libmodbus.tar.gz; `
@ -118,10 +119,10 @@ RUN Set-Location -Path $env:SystemDrive\.; `
Move-Item -Path $env:BUILD_SRC\curl-$env:CURL_VERSION\ -Destination $env:BUILD_SRC\curl; `
`
Write-Host 'Removing downloaded...'; `
Remove-Item -Force -Recurse $env:BUILD_SRC\*.tar.gz; `
Remove-Item -Force -Recurse $env:BUILD_SRC\*.zip; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.tar.gz; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.zip;
Remove-Item -Force -Recurse $env:BUILD_SRC\*.tar.gz -ErrorAction SilentlyContinue; `
Remove-Item -Force -Recurse $env:BUILD_SRC\*.zip -ErrorAction SilentlyContinue; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.tar.gz -ErrorAction SilentlyContinue; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.zip -ErrorAction SilentlyContinue;
FROM ${OS_BASE_IMAGE}
@ -263,6 +264,7 @@ RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.V
cmake -S $env:BUILD_SRC\pcre2 -B $env:BUILD_SRC\pcre2\build `
-G """Visual Studio 17 2022""" `
-A x64 `
-DBUILD_STATIC_LIBS=ON `
-DBUILD_SHARED_LIBS=OFF `
-DPCRE2_BUILD_TESTS=OFF `
-DPCRE2_BUILD_PCRE2GREP=OFF `

13
Dockerfiles/build-base/windows/Dockerfile.agent2
View file

@ -93,14 +93,15 @@ RUN $env:BUILD_SRC = [string]::Format('{0}\build_src', $env:SystemDrive); `
$env:SystemDirectory = [Environment]::SystemDirectory; `
tar -zxf "$env:BUILD_SRC\openssl.tar.gz"; `
Rename-Item -Path $env:BUILD_SRC\openssl-$env:OPENSSL_VERSION -NewName $env:BUILD_SRC\openssl; `
Remove-Item -Recurse -Force $env:BUILD_SRC\openssl\test -ErrorAction SilentlyContinue; `
`
Write-Host 'Removing downloaded...'; `
Remove-Item -Force -Recurse $env:BUILD_SRC\*.tar.gz; `
Remove-Item -Force -Recurse $env:BUILD_SRC\*.zip; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.tar.gz; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.zip; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\msys2.sfx.exe; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.7z;
Remove-Item -Force -Recurse $env:BUILD_SRC\*.tar.gz -ErrorAction SilentlyContinue; `
Remove-Item -Force -Recurse $env:BUILD_SRC\*.zip -ErrorAction SilentlyContinue; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.tar.gz -ErrorAction SilentlyContinue; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.zip -ErrorAction SilentlyContinue; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.exe -ErrorAction SilentlyContinue; `
Remove-Item -Force -Recurse $env:BUILD_DEPS\*.7z -ErrorAction SilentlyContinue;
FROM ${OS_BASE_IMAGE}

4
Dockerfiles/build-mysql/windows/Dockerfile.agent
View file

@ -44,6 +44,10 @@ RUN Set-Location -Path $env:SystemDrive\.; `
`
Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:GIT_BRANCH); `
git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:GIT_BRANCH --depth 1 --single-branch $env:ZBX_SOURCES_DIR; `
Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\ui -ErrorAction SilentlyContinue; `
Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\templates -ErrorAction SilentlyContinue; `
Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\database -ErrorAction SilentlyContinue; `
Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\create -ErrorAction SilentlyContinue; `
`
Write-Host ('Building Zabbix agent {0} version ...' -f $env:ZBX_VERSION); `
Set-Location -Path $env:ZBX_SOURCES_DIR; `

4
Dockerfiles/build-mysql/windows/Dockerfile.agent2
View file

@ -54,6 +54,10 @@ RUN Set-Location -Path $env:SystemDrive\.; `
`
Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:GIT_BRANCH); `
git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:GIT_BRANCH --depth 1 --single-branch $env:ZBX_SOURCES_DIR; `
Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\ui -ErrorAction SilentlyContinue; `
Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\templates -ErrorAction SilentlyContinue; `
Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\database -ErrorAction SilentlyContinue; `
Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\create -ErrorAction SilentlyContinue; `
`
Write-Host ('Building Zabbix agent 2 {0} version ...' -f $env:ZBX_VERSION); `
Set-Location -Path $env:ZBX_SOURCES_DIR; `