revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

cleanup of powershell invocations

Browse source
This commit is contained in:
Christian Kühnel 2019-12-20 08:21:46 +00:00
parent 2b508d1344
commit 4d6362b377
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
containers/agent-windows/Dockerfile
View file

@ -5,7 +5,7 @@ ARG version=ltsc2019
FROM mcr.microsoft.com/windows/servercore:$version FROM mcr.microsoft.com/windows/servercore:$version
# install chocolately as package manager # install chocolately as package manager
RUN powershell -Command ` RUN powershell -NoProfile -InputFormat None -Command `
iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) ; ` iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) ; `
choco feature disable --name showDownloadProgress choco feature disable --name showDownloadProgress
@ -29,7 +29,9 @@ RUN pip install psutil
ENV PYTHONIOENCODING=UTF-8 ENV PYTHONIOENCODING=UTF-8
# update the path variable # update the path variable
RUN powershell.exe -Command $path = $env:path + ';c:\Program Files (x86)\GnuWin32\bin;C:\Program Files\CMake\bin'; Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $path RUN powershell -NoProfile -InputFormat None -Command `
$path = $env:path + ';c:\Program Files (x86)\GnuWin32\bin;C:\Program Files\CMake\bin'; `
Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $path
# use this folder to store the worksapce' # use this folder to store the worksapce'
VOLUME C:\ws VOLUME C:\ws