From ded88cee7f99c3d4cb7afc89853859b32e3dbcfd Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Sat, 24 Apr 2021 19:01:01 +0200 Subject: [PATCH] Revert "Remove GnuWin, add Git Bash to the path" This reverts commit 18ff65644eddfc4ccf879e0a6535b179f607a334. Image with that change fails to build with some obscure errors with file access. --- containers/agent-windows-vs2019/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/containers/agent-windows-vs2019/Dockerfile b/containers/agent-windows-vs2019/Dockerfile index 93401e8..8866f3f 100644 --- a/containers/agent-windows-vs2019/Dockerfile +++ b/containers/agent-windows-vs2019/Dockerfile @@ -40,6 +40,7 @@ RUN powershell -NoProfile -InputFormat None -Command ` # install tools as described in https://llvm.org/docs/GettingStartedVS.html # and a few more that were not documented... +RUN choco install -y gnuwin RUN choco install -y ninja git python3 RUN choco install -y activeperl --version 5.24.3.2404001 RUN choco install -y cmake --version 3.15.4 @@ -56,7 +57,7 @@ ENV PYTHONIOENCODING=UTF-8 # update the path variable # C:\Program Files\Git\usr\bin contains a usable bash and other unix tools. RUN powershell -NoProfile -InputFormat None -Command ` - $path = $env:path + ';C:\Program Files\CMake\bin;C:\Program Files\Git\usr\bin'; ` + $path = $env:path + ';C:\Program Files\CMake\bin;c:\Program Files (x86)\GnuWin32\bin'; ` Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $path # use this folder to store the worksapce'