From d5fe0b814f2f9e9b4c4e48b29d77c72abc76031b Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 29 May 2023 12:44:35 +0900
Subject: [PATCH] Fixed extension for agent2 plugins

---
 .../build-mysql/windows/Dockerfile.agent2     | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile.agent2
index c69c21cf8..7838e8518 100644
--- a/Dockerfiles/build-mysql/windows/Dockerfile.agent2
+++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent2
@@ -55,22 +55,23 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     `
     Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agent2.exe $env:SystemDrive\zabbix2\sbin; `
     Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\src\go\conf\zabbix_agent2.win.conf $env:SystemDrive\zabbix2\conf; `
-	`
-	Set-Location -Path $env:SystemDrive; `
-	Write-Host ('Building Zabbix MongoDB plugin {0} version ...' -f $env:MONGODB_PLUGIN_VERSION); `
-	git -c advice.detachedHead=false clone $env:MONGODB_PLUGIN_SOURCES --branch $env:MONGODB_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\mongodb_plugin; `
-	Set-Location -Path $env:SystemDrive\mongodb_plugin; `
-	mingw32-make; `
-	mv $env:SystemDrive\mongodb_plugin\zabbix-agent2-plugin-mongodb $env:SystemDrive\mongodb_plugin\zabbix-agent2-plugin-mongodb.exe; `
-	Write-Host 'Verifying build ("zabbix-agent2-plugin-mongodb.exe -V") ...'; `
-	& $env:SystemDrive\mongodb_plugin\zabbix-agent2-plugin-mongodb.exe -V; `
-	`
-	Set-Location -Path $env:SystemDrive; `
-	Write-Host ('Building Zabbix PostgreSQL plugin {0} version ...' -f $env:POSTGRESQL_PLUGIN_VERSION); `
-	git -c advice.detachedHead=false clone $env:POSTGRESQL_PLUGIN_SOURCES --branch $env:POSTGRESQL_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\postgresql_plugin; `
-	Set-Location -Path $env:SystemDrive\postgresql_plugin; `
-	mingw32-make; `
-	mv $env:SystemDrive\postgresql_plugin\zabbix-agent2-plugin-postgresql $env:SystemDrive\postgresql_plugin\zabbix-agent2-plugin-postgresql.exe; `
-	Write-Host 'Verifying build ("zabbix-agent2-plugin-postgresql.exe -V") ...'; `
-	& $env:SystemDrive\postgresql_plugin\zabbix-agent2-plugin-postgresql.exe -V; `
-    Write-Host 'Zabbix binaries are compiled...';
+    `
+    Set-Location -Path $env:SystemDrive; `
+    Write-Host ('Building Zabbix MongoDB plugin {0} version ...' -f $env:MONGODB_PLUGIN_VERSION); `
+    git -c advice.detachedHead=false clone $env:MONGODB_PLUGIN_SOURCES --branch $env:MONGODB_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\mongodb_plugin; `
+    Set-Location -Path $env:SystemDrive\mongodb_plugin; `
+    mingw32-make; `
+    mv $env:SystemDrive\mongodb_plugin\zabbix-agent2-plugin-mongodb.exe $env:SystemDrive\mongodb_plugin\zabbix-agent2-plugin-mongodb.exe; `
+    Write-Host 'Verifying build ("zabbix-agent2-plugin-mongodb.exe -V") ...'; `
+    & $env:SystemDrive\mongodb_plugin\zabbix-agent2-plugin-mongodb.exe -V; `
+    `
+    Set-Location -Path $env:SystemDrive; `
+    Write-Host ('Building Zabbix PostgreSQL plugin {0} version ...' -f $env:POSTGRESQL_PLUGIN_VERSION); `
+    git -c advice.detachedHead=false clone $env:POSTGRESQL_PLUGIN_SOURCES --branch $env:POSTGRESQL_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\postgresql_plugin; `
+    Set-Location -Path $env:SystemDrive\postgresql_plugin; `
+    mingw32-make; `
+    mv $env:SystemDrive\postgresql_plugin\zabbix-agent2-plugin-postgresql.exe $env:SystemDrive\postgresql_plugin\zabbix-agent2-plugin-postgresql.exe; `
+    Write-Host 'Verifying build ("zabbix-agent2-plugin-postgresql.exe -V") ...'; `
+    & $env:SystemDrive\postgresql_plugin\zabbix-agent2-plugin-postgresql.exe -V; `
+    Write-Host 'Zabbix binaries are compiled...'; `
+    Remove-Item -Recurse -Force -Path $(go env GOCACHE);