.github/workflows/images_build.yml

@@ -287,7 +287,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
         with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
+          image: tonistiigi/binfmt:qemu-v8.1.5
           platforms: all
 
       - name: Set up Docker Buildx
@@ -516,7 +516,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
         with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
+          image: tonistiigi/binfmt:qemu-v8.1.5
           platforms: all
 
       - name: Set up Docker Buildx
@@ -878,7 +878,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
         with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
+          image: tonistiigi/binfmt:qemu-v8.1.5
           platforms: all
 
       - name: Set up Docker Buildx

Dockerfiles/build-base/windows/Dockerfile.agent

@@ -13,6 +13,8 @@ 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.4
 ARG ZBX_VERSION=${MAJOR_VERSION}.6
 
@@ -29,6 +31,8 @@ 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
 
@@ -135,10 +139,13 @@ 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
 
@@ -214,7 +221,7 @@ RUN Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.V
     $env:CL = """$env:CL /MP"""; `
     cmake -S $env:BUILD_SRC\zlib -B $env:BUILD_SRC\zlib\build `
         -G """Visual Studio 17 2022""" `
-        -A x64 `
+        -A $env:BUILD_ARCH `
         -DBUILD_SHARED_LIBS=OFF `
         -DCMAKE_MSVC_RUNTIME_LIBRARY="""MultiThreaded$<$<CONFIG:Debug>:Debug>""" `
         -DCMAKE_INSTALL_PREFIX="""$env:BUILD_OUTPUT\zlib"""; `
@@ -224,7 +231,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=x64"""; `
+    Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
     `
     Write-Host 'Building OpenSSL library...'; `
     Set-Location -Path $env:BUILD_SRC\openssl; `
@@ -252,14 +259,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=x64"""; `
+    Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
     `
     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 x64 `
+        -A $env:BUILD_ARCH `
         -DBUILD_SHARED_LIBS=OFF `
         -DPCRE2_BUILD_TESTS=OFF `
         -DPCRE2_BUILD_PCRE2GREP=OFF `
@@ -275,7 +282,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=x64"""; `
+    Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
     `
     Write-Host 'Building Libmodbus library ...'; `
     $env:CL = """$env:CL /MP"""; `
@@ -284,7 +291,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 x64 `
+        -A $env:BUILD_ARCH `
         -DBUILD_SHARED_LIBS=OFF `
         -DCMAKE_MSVC_RUNTIME_LIBRARY="""MultiThreaded$<$<CONFIG:Debug>:Debug>""" `
         -DCMAKE_INSTALL_PREFIX="""$env:BUILD_OUTPUT\libmodbus"""; `
@@ -295,13 +302,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=x64"""; `
+    Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
     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 x64 `
+        -A $env:BUILD_ARCH `
         -DCMAKE_MSVC_RUNTIME_LIBRARY="""MultiThreaded$<$<CONFIG:Debug>:Debug>""" `
         -DBUILD_CURL_EXE=OFF `
         -DBUILD_EXAMPLES=OFF `

Dockerfiles/build-base/windows/Dockerfile.agent2

@@ -10,6 +10,8 @@ ARG PWSH_VERSION=7.5.4
 
 ARG MSYSTEM=UCRT64
 
+ARG BUILD_ARCH=x64
+
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}.6
 
@@ -112,10 +114,13 @@ 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

Dockerfiles/build-mysql/windows/Dockerfile.agent

@@ -40,7 +40,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=x64"""; `
+    Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
     `
     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; `

Dockerfiles/build-mysql/windows/Dockerfile.agent2

@@ -53,7 +53,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=x64"""; `
+    Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
     `
     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; `