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

Merge pull request #1384 from zabbix/trunk_windows

Browse Source 
Updated build process for Zabbix agent (windows)
This commit is contained in:
Alexey Pustovalov 2024-05-20 18:18:33 +09:00 committed by GitHub
commit b5646426e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfiles/build-base/windows/Dockerfile.agent
View File

@ -112,6 +112,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
`
Write-Host 'Installing Perl...'; `
Expand-Archive -Path $env:TEMP\perl.zip -DestinationPath $env:SystemDrive\perl\; `
Remove-Item -Force -Recurse $env:SystemDrive\perl\c\; `
`
Write-Host 'Verifying install ("perl -V") ...'; `
perl -V; `

7
Dockerfiles/build-base/windows/Dockerfile.agent2
View File

@ -165,6 +165,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
--installChannelUri https://aka.ms/vs/17/release/channel `
--channelId VisualStudio.17.Release `
# https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022
--add Microsoft.VisualStudio.Component.VC.CMake.Project `
--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64; `
if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { `
throw $err; `
@ -180,9 +181,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
`
Write-Host 'Removing downloaded...'; `
Remove-Item -Force -Recurse $env:TEMP\*; `
Write-Host 'Build environment is ready...';
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
Write-Host 'Build environment is ready...'; `
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
`
New-Item -ItemType directory -Path $env:BUILD_OUTPUT -Force | Out-Null; `
New-Item -ItemType directory -Path $env:BUILD_SRC -Force | Out-Null; `
@ -263,4 +263,5 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
Write-Host 'OpenSSL is ready...'; `
`
Write-Host 'Removing downloaded...'; `
Remove-Item -Force -Recurse $env:SystemDrive\msys64; `
Remove-Item -Force -Recurse $env:TEMP\*;