From 7f59894a31c8b34d20b5cf30f8a037018f6436ea Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 25 Dec 2025 17:11:48 +0900 Subject: [PATCH] Removed env variables for arch for Windows images --- .../build-base/windows/Dockerfile.agent | 21 +++++++------------ .../build-base/windows/Dockerfile.agent2 | 8 ++++--- .../build-mysql/windows/Dockerfile.agent | 2 +- .../build-mysql/windows/Dockerfile.agent2 | 2 +- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent index 60f6ed80e..a230a83bf 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent +++ b/Dockerfiles/build-base/windows/Dockerfile.agent @@ -13,8 +13,6 @@ ARG LIBMODBUS_VERSION=3.1.11 ARG ZLIB_VERSION=1.3.1 ARG CURL_VERSION=8.17.0 -ARG BUILD_ARCH=x64 - ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.22 @@ -31,8 +29,6 @@ ARG LIBMODBUS_VERSION ARG ZLIB_VERSION ARG CURL_VERSION -ARG BUILD_ARCH - ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v$GIT_VERSION.windows.1/MinGit-$GIT_VERSION-64-bit.zip ARG PERL_URL=https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_54201_64bit/strawberry-perl-5.42.0.1-64bit-portable.zip @@ -139,13 +135,10 @@ ARG LIBMODBUS_VERSION ARG ZLIB_VERSION ARG CURL_VERSION -ARG BUILD_ARCH - ARG MAJOR_VERSION ARG ZBX_VERSION ENV ZBX_VERSION=$ZBX_VERSION ` - BUILD_ARCH=$BUILD_ARCH ` VS_BUILDTOOLS_VERSION=$VS_BUILDTOOLS_VERSION ` PCRE2_VERSION=$PCRE2_VERSION OPENSSL_VERSION=$OPENSSL_VERSION LIBMODBUS_VERSION=$LIBMODBUS_VERSION @@ -231,7 +224,7 @@ RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.V Write-Host 'Zlib is ready...'; RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` + Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` ` Write-Host 'Building OpenSSL library...'; ` Set-Location -Path $env:BUILD_SRC\openssl; ` @@ -259,14 +252,14 @@ RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.V Write-Host 'OpenSSL is ready...'; RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` + Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` ` Write-Host 'Building PCRE2 library ...'; ` Set-Location -Path $env:BUILD_SRC\pcre2; ` $env:CL = """$env:CL /MP"""; ` cmake -S $env:BUILD_SRC\pcre2 -B $env:BUILD_SRC\pcre2\build ` -G """Visual Studio 17 2022""" ` - -A $env:BUILD_ARCH ` + -A x64 ` -DBUILD_SHARED_LIBS=OFF ` -DPCRE2_BUILD_TESTS=OFF ` -DPCRE2_BUILD_PCRE2GREP=OFF ` @@ -282,7 +275,7 @@ RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.V Write-Host 'PCRE2 is ready...'; RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` + Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` ` Write-Host 'Building Libmodbus library ...'; ` $env:CL = """$env:CL /MP"""; ` @@ -291,7 +284,7 @@ RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.V Set-Location -Path $env:BUILD_SRC\libmodbus; ` cmake -S $env:BUILD_SRC\libmodbus -B $env:BUILD_SRC\libmodbus\build ` -G """"Visual Studio 17 2022""" ` - -A $env:BUILD_ARCH ` + -A x64 ` -DBUILD_SHARED_LIBS=OFF ` -DCMAKE_MSVC_RUNTIME_LIBRARY="""MultiThreaded$<$:Debug>""" ` -DCMAKE_INSTALL_PREFIX="""$env:BUILD_OUTPUT\libmodbus"""; ` @@ -302,13 +295,13 @@ RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.V Write-Host 'Libmodbus is ready...'; RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` + Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` Write-Host 'Building Curl library...'; ` Set-Location -Path $env:BUILD_SRC\curl; ` $env:CL = """$env:CL /MP"""; ` cmake -S $env:BUILD_SRC\curl -B $env:BUILD_SRC\curl\build ` -G """Visual Studio 17 2022""" ` - -A $env:BUILD_ARCH ` + -A x64 ` -DCMAKE_MSVC_RUNTIME_LIBRARY="""MultiThreaded$<$:Debug>""" ` -DBUILD_CURL_EXE=OFF ` -DBUILD_EXAMPLES=OFF ` diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2 index 7120313c1..ddc3617d4 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-base/windows/Dockerfile.agent2 @@ -10,10 +10,15 @@ ARG PWSH_VERSION=7.5.4 ARG MSYSTEM=UCRT64 +<<<<<<< HEAD ARG BUILD_ARCH=x64 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.22 +======= +ARG MAJOR_VERSION=7.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 +>>>>>>> 78ce5093c (Removed env variables for arch for Windows images) FROM ${OS_BASE_IMAGE} as src @@ -113,13 +118,10 @@ ARG VS_BUILDTOOLS_VERSION ARG MSYSTEM -ARG BUILD_ARCH - ARG MAJOR_VERSION ARG ZBX_VERSION ENV ZBX_VERSION=$ZBX_VERSION ` - BUILD_ARCH=$BUILD_ARCH ` VS_BUILDTOOLS_VERSION=$VS_BUILDTOOLS_VERSION GOLANG_VERSION=$GOLANG_VERSION ` PCRE2_VERSION=$PCRE2_VERSION OPENSSL_VERSION=$OPENSSL_VERSION ` CHERE_INVOKING=yes MSYSTEM=$MSYSTEM diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent index 407dbedc3..ce2cda33e 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent @@ -38,7 +38,7 @@ RUN Set-Location -Path $env:SystemDrive\.; ` New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\conf | Out-Null; ` ` Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` + Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` ` 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; ` diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 index 44ecc468c..229e49682 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 @@ -49,7 +49,7 @@ RUN Set-Location -Path $env:SystemDrive\.; ` New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin | Out-Null; ` ` Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` + Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` ` 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; `