Skip to content

Add entry points to the windows docker files #3462

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
daxian-dbw merged 4 commits into from
Mar 31, 2017
Merged

Add entry points to the windows docker files #3462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f8269f
Add entry points to the windows docker files
TravisEz13 Mar 30, 2017
15fae22
run PowerShell directly
TravisEz13 Mar 30, 2017
d8ca20d
updated symbolic link folder to be latest instead of Core
TravisEz13 Mar 31, 2017
9722c5b
Add latest tag to nano dockerfile.
TravisEz13 Mar 31, 2017
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
10 changes: 6 additions & 4 deletions docker/release/nanoserver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/nanoserver
FROM microsoft/nanoserver:latest
MAINTAINER brycem@microsoft.com
Copy link
Member

@SteveL-MSFT SteveL-MSFT Mar 31, 2017

Choose a reason for hiding this comment

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

Should we change this to powershellteam@hotmail.com?

Copy link
Member Author

@TravisEz13 TravisEz13 Mar 31, 2017

Choose a reason for hiding this comment

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

Does that go anywhere? All the rest have actual email addresses on them. If we want to update them, that should probably be a separate item. The MAINTAINER tag is deprecated anyway. I filed #3465 for this. Can we continue this discussion there?

LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
LABEL Description="This Dockerfile will install the latest release of PS."
Expand Down Expand Up @@ -32,11 +32,11 @@ RUN $ErrorActionPreference='Stop'; `
[System.IO.Compression.ZipFile]::ExtractToDirectory($ZipFile,$PsFolder) ; `
if (Get-ChildItem -Path $PsFolder/powershell.exe) { `
Remove-Item -Path $ZipFile ; `
New-Item -Type SymbolicLink -Path $PsFolder\ -Name Core -Value $PsFolder `
New-Item -Type SymbolicLink -Path $PsFolder\ -Name latest -Value $PsFolder `
} else { throw 'Installation failed! See c:\Dockerfile.log' } ;

# Verify New Powershell.exe runs
SHELL ["C:\\Program Files\\PowerShell\\Core\\PowerShell.exe", "-command"]
SHELL ["C:\\Program Files\\PowerShell\\latest\\PowerShell.exe", "-command"]
RUN Start-Transcript -path C:\Dockerfile.log -append -IncludeInvocationHeader ; `
$ErrorActionPreference='Stop'; `
Write-Output $PSVersionTable ; `
Expand All @@ -45,4 +45,6 @@ RUN Start-Transcript -path C:\Dockerfile.log -append -IncludeInvocationHeader ;
} ;

# Persist %PSCORE% ENV variable for user convenience
ENV PSCORE='"C:\Program Files\PowerShell\Core\PowerShell.exe"'
ENV PSCORE='"C:\Program Files\PowerShell\latest\PowerShell.exe"'

ENTRYPOINT ["C:\\Program Files\\PowerShell\\latest\\PowerShell.exe"]
10 changes: 6 additions & 4 deletions docker/release/windowsservercore/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/windowsservercore
FROM microsoft/windowsservercore:latest
Copy link
Member

@SteveL-MSFT SteveL-MSFT Mar 31, 2017

Choose a reason for hiding this comment

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

How come you don't have this suffix for nanoserver?

Copy link
Member Author

@TravisEz13 TravisEz13 Mar 31, 2017

Choose a reason for hiding this comment

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

I didn't mean to add it, but it should be there. I'll add it too.

MAINTAINER brycem@microsoft.com
LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
LABEL Description="This Dockerfile will install the latest release of PS."
Expand Down Expand Up @@ -32,11 +32,11 @@ RUN $ErrorActionPreference='Stop'; `
if ($log -match 'Installation success or error status: 0') { `
Remove-Item -Path $MsiFile ; `
$psexe=Get-Item -Path $Env:ProgramFiles\PowerShell\*\powershell.exe ; `
New-Item -Type SymbolicLink -Path $Env:ProgramFiles\PowerShell\ -Name Core -Value $psexe.DirectoryName `
New-Item -Type SymbolicLink -Path $Env:ProgramFiles\PowerShell\ -Name latest -Value $psexe.DirectoryName `
} else { throw 'Installation failed! See c:\PowerShell-win10-x64.msi.log' } ;

# Verify New Powershell.exe runs
SHELL ["C:\\Program Files\\PowerShell\\Core\\PowerShell.exe", "-command"]
SHELL ["C:\\Program Files\\PowerShell\\latest\\PowerShell.exe", "-command"]
RUN Start-Transcript -path C:\Dockerfile.log -append -IncludeInvocationHeader ; `
$ErrorActionPreference='Stop'; `
Write-Output $PSVersionTable ; `
Expand All @@ -45,4 +45,6 @@ RUN Start-Transcript -path C:\Dockerfile.log -append -IncludeInvocationHeader ;
} ;

# Persist %PSCORE% ENV variable for user convenience
ENV PSCORE='"C:\Program Files\PowerShell\Core\PowerShell.exe"'
ENV PSCORE='"C:\Program Files\PowerShell\latest\PowerShell.exe"'

ENTRYPOINT ["C:\\Program Files\\PowerShell\\latest\\PowerShell.exe"]