From c82168931c39d8013e7246f8acf79cc5492d4908 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 20 May 2024 18:17:51 +0900
Subject: [PATCH] Updated build process for Zabbix agent (windows)

---
 Dockerfiles/build-base/windows/Dockerfile.agent  | 1 +
 Dockerfiles/build-base/windows/Dockerfile.agent2 | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent
index 51069c375..a3a2fef85 100644
--- a/Dockerfiles/build-base/windows/Dockerfile.agent
+++ b/Dockerfiles/build-base/windows/Dockerfile.agent
@@ -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; `
diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2
index 455ab2d46..c4f161619 100644
--- a/Dockerfiles/build-base/windows/Dockerfile.agent2
+++ b/Dockerfiles/build-base/windows/Dockerfile.agent2
@@ -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\*;