Skip to content

use powershell windowsservercore docker image for release builds #6226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 2 commits into from
Feb 23, 2018
Merged

use powershell windowsservercore docker image for release builds #6226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b54cd90
use powershell windowsservercore image
TravisEz13 Feb 23, 2018
432e000
remove update of powershell
TravisEz13 Feb 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# escape=`
#0.3.6 (no powershell 6)
FROM microsoft/windowsservercore
FROM microsoft/powershell:windowsservercore
LABEL maintainer='PowerShell Team <powershellteam@hotmail.com>'
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"]
Copy link
Member

@daxian-dbw daxian-dbw Feb 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the install-powershell.ps1 part below should be removed now?

Copy link
Member Author

@TravisEz13 TravisEz13 Feb 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

# Install Git, and NuGet
# Git installs to C:\Program Files\Git
# nuget installs to C:\ProgramData\chocolatey\bin\NuGet.exe
Expand All @@ -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"]