From 6cd97fc2c416a159aea6c47d4e0acfff1b952ca0 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 21 May 2024 00:31:35 +0900 Subject: [PATCH] Updated build process for Zabbix agent (windows) --- Dockerfiles/build-base/windows/Dockerfile.agent2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2 index 475802282..eaa401e06 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-base/windows/Dockerfile.agent2 @@ -146,13 +146,13 @@ RUN Set-Location -Path $env:SystemDrive\.; ` ` Write-Host 'Installing MSYS2...'; ` & $env:TEMP\msys2.sfx.exe -y -o"""$env:SystemDrive\""" | Out-Null; ` -# 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'; ` + bash -lc 'pacman -Syuu --needed --noconfirm --ask=20'; ` + bash -lc 'pacman -Syu --noconfirm'; ` + bash -lc 'pacman --sync --quiet --noconfirm mingw-w64-ucrt-x86_64-cmake'; ` compact /c /i /s:$env:SystemDrive\msys64 | Out-Null; ` ` - Write-Host 'Verifying install ("sh --version") ...'; ` - sh.exe --version; ` + Write-Host 'Verifying install ("bash --version") ...'; ` + bash --version; ` ` Write-Host ('{0} - Visual Studio components installing...' -f $(Get-Date -format 'u')); ` cmd /C start /w $env:TEMP\vs_buildtools.exe `