From b54cd90b5a005ac8b3d6399d16ddaee68295a5df Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 23 Feb 2018 10:36:13 -0800 Subject: [PATCH 1/2] use powershell windowsservercore image --- .../Images/microsoft_powershell_windowsservercore/DockerFile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile index 110d5bc4995..94c3a8a8855 100644 --- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile +++ b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile @@ -1,10 +1,10 @@ # escape=` #0.3.6 (no powershell 6) -FROM microsoft/windowsservercore +FROM microsoft/powershell:windowsservercore LABEL maintainer='PowerShell Team ' LABEL description="This Dockerfile for Windows Server Core with git installed via chocolatey." -SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"] +SHELL ["C:\\Program Files\\PowerShell\\latest\\pwsh.exe", "-command"] # Install Git, and NuGet # Git installs to C:\Program Files\Git # nuget installs to C:\ProgramData\chocolatey\bin\NuGet.exe From 432e000b99fb224533418eb00283a9ce405fb199 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 23 Feb 2018 14:01:24 -0800 Subject: [PATCH 2/2] remove update of powershell --- .../Images/microsoft_powershell_windowsservercore/DockerFile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile index 94c3a8a8855..c8be0a943e4 100644 --- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile +++ b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile @@ -21,8 +21,4 @@ RUN Import-Module ./containerFiles/wix.psm1; ` COPY PowerShellPackage.ps1 / -ADD https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.ps1 \install-powershell.ps1 -RUN new-item -Path 'C:\Program Files\PowerShell\latest' -ItemType Directory; ` - \install-powershell.ps1 -AddToPath -Destination 'C:\Program Files\PowerShell\latest' - ENTRYPOINT ["C:\\Program Files\\PowerShell\\latest\\pwsh.exe", "-command"]