From fc11e72647ac89269d361b47f7d1947521e110b6 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 20 May 2024 13:56:47 +0900 Subject: [PATCH 1/2] Updated build process for Zabbix agent (windows) --- Dockerfiles/.DS_Store | Bin 0 -> 6148 bytes Dockerfiles/agent/windows/docker-entrypoint.ps1 | 2 +- Dockerfiles/agent2/windows/docker-entrypoint.ps1 | 2 +- Dockerfiles/build-base/windows/Dockerfile.agent | 3 ++- Dockerfiles/build-mysql/.DS_Store | Bin 0 -> 6148 bytes Dockerfiles/build-mysql/windows/Dockerfile.agent | 12 ++++++------ 6 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Dockerfiles/.DS_Store create mode 100644 Dockerfiles/build-mysql/.DS_Store diff --git a/Dockerfiles/.DS_Store b/Dockerfiles/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..faab8d4d3b190a1113567527b03d3a802b295f7f GIT binary patch literal 6148 zcmeHK%}T>S5T4ao(-xrzg&r5YR*a3mcnMKoz=$4HYC?hrV^*8gBBhYCzK~Di^Emrc zFt$Aj{&fdtzuDQDg!$6l?EnCAd*KE^0{~1^jz$fK3BuR8j>(+zR1k@HMh@+upWO!u z3&x_gLo=Wm_-zdEy;}hvt|5XH%KP^USE;2Q1C~IE}g@Ar2!9xj2i{ko8^GOT$d$dUC<6n$=FDIT+a1 zZj0LX*04nfdu^*lH|_1=uxhTXuJ0drZj-x|JxdY^o;gC66pr8pjZ#gIUN=oxdX0Xb zQ-c6{5JLhXtfB2g2GNIe>o38liG$H^ zWtLIxAG1EoBM`l*U@6c!R?IuO--5cOuFIus(_j?bqe9Ec-PkD39^K$(GgIc@O!|7d#u zUry39&46a$Uok+8L+{YVlGNQgRvf=;De4s}7amtg6e&2U>sT24DsG|*!8OVaL`PvE S5j`mSkAR>-51N5*W#Anb6U|uw literal 0 HcmV?d00001 diff --git a/Dockerfiles/agent/windows/docker-entrypoint.ps1 b/Dockerfiles/agent/windows/docker-entrypoint.ps1 index c7a459b23..6a66b03ef 100644 --- a/Dockerfiles/agent/windows/docker-entrypoint.ps1 +++ b/Dockerfiles/agent/windows/docker-entrypoint.ps1 @@ -111,7 +111,7 @@ function Update-Config-Multiple-Var { function Prepare-Zbx-Agent-Config { Write-Host "** Preparing Zabbix agent configuration file" - $ZbxAgentConfig="$ZabbixConfigDir\zabbix_agentd.win.conf" + $ZbxAgentConfig="$ZabbixConfigDir\zabbix_agentd.conf" if ([string]::IsNullOrWhitespace($env:ZBX_PASSIVESERVERS)) { $env:ZBX_PASSIVESERVERS="" diff --git a/Dockerfiles/agent2/windows/docker-entrypoint.ps1 b/Dockerfiles/agent2/windows/docker-entrypoint.ps1 index 8777e39fc..22c0b540d 100644 --- a/Dockerfiles/agent2/windows/docker-entrypoint.ps1 +++ b/Dockerfiles/agent2/windows/docker-entrypoint.ps1 @@ -111,7 +111,7 @@ function Update-Config-Multiple-Var { function Prepare-Zbx-Agent-Config { Write-Host "** Preparing Zabbix agent configuration file" - $ZbxAgentConfig="$ZabbixConfigDir\zabbix_agent2.win.conf" + $ZbxAgentConfig="$ZabbixConfigDir\zabbix_agent2.conf" if ([string]::IsNullOrWhitespace($env:ZBX_PASSIVESERVERS)) { $env:ZBX_PASSIVESERVERS="" diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent index daee37fd6..51069c375 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent +++ b/Dockerfiles/build-base/windows/Dockerfile.agent @@ -8,6 +8,7 @@ ARG OPENSSL_VERSION=3.3.0 ARG LIBMODBUS_VERSION=3.1.10 ARG ZLIB_VERSION=1.3.1 ARG CURL_VERSION=8.7.1 + ARG BUILD_ARCH=x64 ARG CPU_MODEL=AMD64 @@ -29,7 +30,7 @@ ARG CURL_URL=https://curl.se/download/curl-$CURL_VERSION.tar.gz ENV ZBX_VERSION=$ZBX_VERSION ` BUILD_ARCH=$BUILD_ARCH CPU_MODEL=$CPU_MODEL ` GIT_URL=$GIT_URL PERL_URL=$PERL_URL NASM_URL=$NASM_URL ` - VS_BUILDTOOLS_URL ` + VS_BUILDTOOLS_URL=$VS_BUILDTOOLS_URL ` PCRE2_VERSION=$PCRE2_VERSION OPENSSL_VERSION=$OPENSSL_VERSION LIBMODBUS_VERSION=$LIBMODBUS_VERSION ` PCRE2_URL=$PCRE2_URL OPENSSL_URL=$OPENSSL_URL LIBMODBUS_URL=$LIBMODBUS_URL ` ZLIB_URL=$ZLIB_URL CURL_URL=$CURL_URL diff --git a/Dockerfiles/build-mysql/.DS_Store b/Dockerfiles/build-mysql/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..07b9ec26b121285e1fc28b9b30e9c1fb5009c040 GIT binary patch literal 6148 zcmeHK%}T>S5Z-O8O({YS3Oz1(Ef|ed#7n641&ruHr6#0kFlI}WnnNk%tS{t~_&m<+ zZop~|odd`@|Q;UdEGRY;T{+G!No*GE)h0G=Y$tt2m8hF_iN(%2cke9ahKcjP2fH;krkC;W~q5 zUo4IfoW3}82g_y0+S%PZIUheJPpN#-RB~Wl$(F$iUP1X%)w4fK6PezFr^>3L35fw> zfEXYK){6mi4p`mwDx0b$28e+lFo64mfQIN9EH$dF13q|tMt=(t1$2B%APR$?!BQi5 zK)6l?)T!J&F}O|#yD)K{!BV46XI#w;y{Z<~HwF255G!%?0Q2_yc?V Zi1Q4V8gUe~t8_rR2q;46Lk#=^10O^>Oy~dr literal 0 HcmV?d00001 diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent index ce5983da6..1b53886a3 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent @@ -63,11 +63,11 @@ RUN Set-Location -Path $env:SystemDrive\.; ` all; ` ` Write-Host 'Verifying build ("zabbix_agentd.exe -V") ...'; ` - & $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe -V; ` - dumpbin /dependents $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe; ` + & $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe -V; ` + dumpbin /dependents $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe; ` ` - Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe $env:SystemDrive\zabbix_output\sbin; ` - Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_get.exe $env:SystemDrive\zabbix_output\bin; ` - Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_sender.exe $env:SystemDrive\zabbix_output\bin; ` - Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\conf\zabbix_agentd.win.conf $env:SystemDrive\zabbix_output\conf\zabbix_agentd.conf; ` + Copy-Item -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe $env:SystemDrive\zabbix_output\sbin; ` + Copy-Item -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_get.exe $env:SystemDrive\zabbix_output\bin; ` + Copy-Item -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_sender.exe $env:SystemDrive\zabbix_output\bin; ` + Copy-Item -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION\conf\zabbix_agentd.win.conf $env:SystemDrive\zabbix_output\conf\zabbix_agentd.conf; ` Write-Host 'Zabbix binaries are compiled...'; From f1fa58b5f6a097f92f495d2a1be141a83e002851 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 20 May 2024 13:56:59 +0900 Subject: [PATCH 2/2] Updated build process for Zabbix agent (windows) --- Dockerfiles/.DS_Store | Bin 6148 -> 0 bytes Dockerfiles/build-mysql/.DS_Store | Bin 6148 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Dockerfiles/.DS_Store delete mode 100644 Dockerfiles/build-mysql/.DS_Store diff --git a/Dockerfiles/.DS_Store b/Dockerfiles/.DS_Store deleted file mode 100644 index faab8d4d3b190a1113567527b03d3a802b295f7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5T4ao(-xrzg&r5YR*a3mcnMKoz=$4HYC?hrV^*8gBBhYCzK~Di^Emrc zFt$Aj{&fdtzuDQDg!$6l?EnCAd*KE^0{~1^jz$fK3BuR8j>(+zR1k@HMh@+upWO!u z3&x_gLo=Wm_-zdEy;}hvt|5XH%KP^USE;2Q1C~IE}g@Ar2!9xj2i{ko8^GOT$d$dUC<6n$=FDIT+a1 zZj0LX*04nfdu^*lH|_1=uxhTXuJ0drZj-x|JxdY^o;gC66pr8pjZ#gIUN=oxdX0Xb zQ-c6{5JLhXtfB2g2GNIe>o38liG$H^ zWtLIxAG1EoBM`l*U@6c!R?IuO--5cOuFIus(_j?bqe9Ec-PkD39^K$(GgIc@O!|7d#u zUry39&46a$Uok+8L+{YVlGNQgRvf=;De4s}7amtg6e&2U>sT24DsG|*!8OVaL`PvE S5j`mSkAR>-51N5*W#Anb6U|uw diff --git a/Dockerfiles/build-mysql/.DS_Store b/Dockerfiles/build-mysql/.DS_Store deleted file mode 100644 index 07b9ec26b121285e1fc28b9b30e9c1fb5009c040..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z-O8O({YS3Oz1(Ef|ed#7n641&ruHr6#0kFlI}WnnNk%tS{t~_&m<+ zZop~|odd`@|Q;UdEGRY;T{+G!No*GE)h0G=Y$tt2m8hF_iN(%2cke9ahKcjP2fH;krkC;W~q5 zUo4IfoW3}82g_y0+S%PZIUheJPpN#-RB~Wl$(F$iUP1X%)w4fK6PezFr^>3L35fw> zfEXYK){6mi4p`mwDx0b$28e+lFo64mfQIN9EH$dF13q|tMt=(t1$2B%APR$?!BQi5 zK)6l?)T!J&F}O|#yD)K{!BV46XI#w;y{Z<~HwF255G!%?0Q2_yc?V Zi1Q4V8gUe~t8_rR2q;46Lk#=^10O^>Oy~dr