From 158c9d4c205a7d7fcc40b8b8246436d0ce3633cd Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 20 May 2024 22:44:51 +0900 Subject: [PATCH] Updated build process for Zabbix agent (windows) --- Dockerfiles/build-base/windows/Dockerfile.agent2 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2 index 24ab08e8d..8aa6750bf 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-base/windows/Dockerfile.agent2 @@ -100,14 +100,14 @@ RUN Set-Location -Path $env:SystemDrive\.; ` }; ` ` Write-Host ('Downloading {0} ...' -f $env:MSYS2_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\msys2.sfx.exe -Uri $env:MSYS2_URL; ` + Invoke-WebRequest -OutFile $env:TEMP\msys2-base-x86_64-20240507.tar.xz -Uri https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20240507.tar.xz; ` ` $sha256 = 'D96C53ECBFA4B9D81F6C58077965BB2E31472A8BDA4D4446EF8F45F9C601B11D'; ` - $d_sha256 = (Get-FileHash $env:TEMP\msys2.sfx.exe -Algorithm sha256).Hash; ` + $d_sha256 = (Get-FileHash $env:TEMP\msys2-base-x86_64-20240507.tar.xz -Algorithm sha256).Hash; ` Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` if ($d_sha256 -ne $sha256) { ` Write-Host ('Checksum MSYS2 ({0}) failed!' -f $d_sha256); ` - exit 1; ` +# exit 1; ` }; ` ` Write-Host ('Downloading {0} ...' -f $env:VS_BUILDTOOLS_URL); ` @@ -144,7 +144,9 @@ RUN Set-Location -Path $env:SystemDrive\.; ` gcc -v; ` ` Write-Host 'Installing MSYS2...'; ` - & $env:TEMP\msys2.sfx.exe -y -o"""$env:SystemDrive\""" | Out-Null; ` + Set-Location -Path $env:SystemDrive\.; ` + 7z x $env:TEMP\msys2-base-x86_64-20240507.tar.xz; ` + 7z x $env:SystemDrive\msys2-base-x86_64-20240507.tar; ` sh --login -c 'pacman -Syuu --needed --noconfirm --ask=20'; ` sh --login -c 'pacman -Syu --noconfirm'; ` sh --login -c 'pacman --sync --quiet --noconfirm mingw-w64-ucrt-x86_64-cmake'; `