Updating dockerfiles for Windows #3017
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| # escape=` | ||
| FROM brycem/win10build | ||
| LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md",` | ||
| Description="This Dockerfile will install and build the latest nighly PS build." | ||
|
|
||
| ARG FORK=PowerShell | ||
| ARG BRANCH=master | ||
| ARG PULLREQ=na | ||
|
|
||
| # Prepare shell environment to Log-to > C:\Dockerfile.log | ||
| SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe","-command","$ErrorActionPreference = 'Stop';","$ConfirmPreference = 'None';",` | ||
| "$VerbosePreference = 'Continue';","Start-Transcript -path C:\\Dockerfile.log -append -IncludeInvocationHeader;","$PSVersionTable|Write-Output;",` | ||
| "$WinVer = $(Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion');",` | ||
| "$OsVer = $('OperatingSystem: '+ $WinVer.ProductName +' '+$WinVer.EditionId+' '+$WinVer.InstallationType);",` | ||
| "$BldVer = $('FullBuildString: '+ $WinVer.BuildLabEx); Write-Output -InputObject $OsVer,$BldVer; "] | ||
| WORKDIR / | ||
|
|
||
| # Build & Test PowerShell | ||
| RUN $vcBld = ${env:ProgramFiles(x86)}+'\Microsoft Visual C++ Build Tools\vcbuildtools.bat';` | ||
| test-path $vcBld; [String]$cmdline = ([char]0x0022+$vcBld+[char]0x0022+' x64&set');` | ||
| cmd /c $cmdLine | Foreach-Object {$cmdVar,$cmdVal=$_.split('=');Set-Item -Path env:$cmdVar -Value $cmdVal};` | ||
| dir env:|out-host;` | ||
| If (test-path c:\PowerShell) {Remove-Item c:\PowerShell -Recurse -Force -ea Ignore}` | ||
| $gitArgs=@('clone','-v','--recursive',('https://github.com/'+$env:FORK+'/PowerShell.git'),'-b',$env:BRANCH);` | ||
| $proc = Start-Process git.exe -ArgumentList $gitArgs -PassThru -Wait -NoNewWindow;` | ||
| If (($proc.ExitCode -eq 0) -and (Test-Path 'C:\PowerShell\Build.psm1')) {` | ||
| Write-Host 'PowerShell repo successfully cloned to c:\PowerShell.'` | ||
| } else {Echo $gitArgs; dir c:\PowerShell\;Throw ('git.exe returned '+$proc.ExitCode)}` | ||
| Set-Location C:\PowerShell;` | ||
| If ($Env:PULLREQ -ne 'na') {` | ||
| $gitArgs=@('fetch','-v','origin',('+refs/pull/'+$env:PULLREQ+'/merge:'));` | ||
| $proc = Start-Process git.exe -ArgumentList $gitArgs -PassThru -Wait -NoNewWindow;` | ||
| If ($proc.ExitCode -eq 0) {` | ||
| Write-Host ('PowerShell repo successfully fetched PR:'+$env:PULLREQ)` | ||
| } else {Echo $gitArgs; Throw ('git.exe returned '+$proc.ExitCode)}` | ||
| $gitArgs=@('checkout','-vf','FETCH_HEAD')` | ||
| }` | ||
| $Global:IsWindows=$true;` | ||
| git submodule update --init;` | ||
| Import-Module .\build.psm1;Start-PSBootstrap;` | ||
| Start-PSBuild -Clean -CrossGen -Publish -PSModuleRestore -Configuration 'Release' -Runtime 'win10-x64';` | ||
| $testResultsNonAdminFile = 'C:\TestsResultsNonAdmin.xml';` | ||
| $testResultsAdminFile = 'C:\TestsResultsAdmin.xml';` | ||
| $ExcludeTag = @('Slow', 'Feature', 'Scenario');` | ||
| Write-Host -Foreground Green 'Running "CI" CoreCLR tests..';` | ||
| $env:CoreOutput = Split-Path -Parent (Get-PSOutput -Options (New-PSOptions -Configuration 'Release'));` | ||
| Start-PSPester -bindir $env:CoreOutput -outputFile $testResultsNonAdminFile -Unelevate -Tag @() ` | ||
| -ExcludeTag ($ExcludeTag + @('RequireAdminOnWindows'));` | ||
| Start-PSPester -bindir $env:CoreOutput -outputFile $testResultsAdminFile ` | ||
| -Tag @('RequireAdminOnWindows') -ExcludeTag $ExcludeTag;` | ||
| Test-PSPesterResults -TestResultsFile $testResultsNonAdminFile,$testResultsAdminFile;` | ||
| Start-PSBuild -FullCLR -Configuration 'Release' -PSModuleRestore;` | ||
| $env:FullOutput = Split-Path -Parent (Get-PSOutput -Options (New-PSOptions -FullCLR));` | ||
| Write-Host -Foreground Green 'Run FullCLR tests';` | ||
| $testResultsFileFullCLR = 'C:\TestsResults.FullCLR.xml';` | ||
| Start-PSPester -FullCLR -bindir $env:FullOutput -outputFile $testResultsFileFullCLR ` | ||
| -Tag $null -path 'test/fullCLR';` | ||
| Test-PSPesterResults -TestResultsFile $testResultsFileFullCLR;` | ||
| Set-BuildVariable -Name TestPassed -Value True;` | ||
| $zipFile = Start-PSPackage -Type zip; $msiFile = Start-PSPackage -Type msi;` | ||
| $MsiArgs = @(('/i '+$msiFile),'/log c:\PowerShell-win10-x64.msi.log','/qn','/norestart');` | ||
| $proc = Start-Process -FilePath msiexec.exe -ArgumentList $MsiArgs -wait -PassThru;` | ||
| If ($proc.ExitCode -eq 0) {` | ||
| $psexe = Get-Item -Path $Env:ProgramFiles\PowerShell\*\powershell.exe;` | ||
| Write-Host ('Successfully installed to '+$psexe);` | ||
| New-Item -Type SymbolicLink -Path $Env:ProgramFiles\PowerShell\ -Name Core ` | ||
| -Value $psexe.DirectoryName | Out-Null;` | ||
| $PSVersionTable | Export-Clixml -Path .\OsPsVer.clix;` | ||
| [System.Environment]::SetEnvironmentVariable('PsCoreExe',($psexe.FullName),'Machine')` | ||
| } else {` | ||
| Write-Output -InputObject $(get-content -Path C:\PowerShell-win10-x64.msi.log -ea Ignore);` | ||
| Throw ('Installation failed! PowerShell-win10-x64.msi returned '+$proc.ExitCode)` | ||
| } | ||
|
|
||
| # Verify New Powershell.exe | ||
| SHELL ["C:\\Program Files\\PowerShell\\Core\\powershell.exe","-command","$ErrorActionPreference='Stop';"] | ||
| RUN $PSVersionTable|Out-Host; $OsPsVer = Import-Clixml -Path .\OsPsVer.clix;` | ||
| If ($PSVersionTable.PSEdition -ne 'Core') {Throw ('['+$PSVersionTable.PSEdition+'] is not [Core]!')}` | ||
| If ($PSVersionTable.PSVersion -eq $OsPsVer.PSVersion) {Throw ('['+$PSVersionTable.PSVersion+'] is unchanged...')}` | ||
| Remove-Item C:\Dockerfile.log -Force; Remove-Item C:\PowerShell\OsPsVer.clix -Force;` | ||
| Write-Host ('Hello World! PowerShell Core '+$PSVersionTable.PSVersion+' has been built and installed.') | ||
|
|
||
| ENTRYPOINT ["C:\\Program Files\\PowerShell\\Core\\powershell.exe","-noexit","-command","$ErrorActionPreference='Stop';"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,44 @@ | ||
| # escape=` | ||
| FROM microsoft/nanoserver | ||
| LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md",` | ||
| Description="This Dockerfile will install the latest milestone release of PS." | ||
|
|
||
| ARG POWERSHELL_ZIP=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.15/PowerShell_6.0.0-alpha.15-win10-win2k16-x64.zip | ||
| ARG POWERSHELL_SHA256=4297C4ADBF93133CD343B7A4248FAEE225060E3A739A38D9368E1AA2086381BB | ||
|
|
||
| # Prepare shell environment to Log-to > C:\Dockerfile.log | ||
| SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe","-command","$ErrorActionPreference = 'Stop';","$ConfirmPreference = 'None';",` | ||
| "$VerbosePreference = 'Continue';","Start-Transcript -path C:\\Dockerfile.log -append -IncludeInvocationHeader;","$PSVersionTable|Write-Output;",` | ||
| "$WinVer = $(Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion');",` | ||
| "$OsVer = $('OperatingSystem: '+ $WinVer.ProductName +' '+$WinVer.EditionId+' '+$WinVer.InstallationType);",` | ||
| "$BldVer = $('FullBuildString: '+ $WinVer.BuildLabEx); Write-Output -InputObject $OsVer,$BldVer; "] | ||
| WORKDIR / | ||
|
|
||
| # Install PowerShell package and clean up | ||
| ADD $POWERSHELL_ZIP /PowerShell-win10-win2k16-x64.zip | ||
| RUN [System.IO.FileInfo]$ZipFile = Get-Item -Path ./powershell-win10-win2k16-x64.zip;` | ||
| [String]$ZipHash = (Get-FileHash -Path $ZipFile -Algorithm SHA256 | select -ExpandProperty Hash);` | ||
| If ($ZipHash -notmatch $Env:POWERSHELL_SHA256){` | ||
| Throw [String]$('['+$ZipHash+'] does not match ['+$Env:POWERSHELL_SHA256+']!')` | ||
| }` | ||
| [System.IO.DirectoryInfo]$PsFolder=New-Item -Path $Env:ProgramFiles\PowerShell -ItemType Directory -Force;` | ||
| Add-Type -AssemblyName System.IO.Compression.ZipFile;` | ||
| [System.IO.Compression.ZipFile]::ExtractToDirectory($ZipFile,$PsFolder);` | ||
| If (Get-ChildItem -Path $PsFolder/powershell.exe){` | ||
| Write-Host 'Powershell installation completed successfully.'; Remove-Item -Path $ZipFile;` | ||
| New-Item -Type SymbolicLink -Path $PsFolder\ -Name Core -Value $PsFolder | Out-Null;` | ||
| $PSVersionTable | Export-Clixml -Path .\OsPsVer.clix;` | ||
| } else {Throw 'Installation failed! See c:\Dockerfile.log'} | ||
|
|
||
| # Verify New Powershell.exe runs | ||
| SHELL ["C:\\Program Files\\PowerShell\\Core\\powershell.exe","-command","$ErrorActionPreference='Stop';"] | ||
| RUN $PSVersionTable|Out-Host; $OsPsVer = Import-Clixml -Path .\OsPsVer.clix; Remove-Item -Path .\OsPsVer.clix;` | ||
| If ($PSVersionTable.PSEdition -ne 'Core') {Throw [String]$('['+$PSVersionTable.PSEdition+'] is not [Core]!')}` | ||
| If ($PSVersionTable.PSVersion -eq $OsPsVer.PSVersion) {Throw [String]$('['+$PSVersionTable.PSVersion+'] is unchanged...')}` | ||
| Write-Host "Hello World! PowerShell Core installation has been verfied." | ||
|
|
||
| SHELL ["CMD.EXE","/C"] | ||
| RUN del /q C:\Dockerfile.log &>c:\entrypoint.bat echo @echo off &>>c:\entrypoint.bat` | ||
| echo "C:\Program Files\PowerShell\Core\powershell.exe" -command $ErrorActionPreference='Stop';%* | ||
|
|
||
| ENTRYPOINT ["C:\\Program Files\\PowerShell\\Core\\powershell.exe","-noexit","-command","$ErrorActionPreference='Stop';"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,45 @@ | ||
| # escape=` | ||
| FROM microsoft/windowsservercore | ||
| LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md",` | ||
| Description="This Dockerfile will install the latest release of PS." | ||
|
|
||
| ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.15/PowerShell_6.0.0-alpha.15-win10-win2k16-x64.msi | ||
|
Member
There was a problem hiding this comment. @brycem Please pick up the latest release MSI here Then the experience would be similar to Linux. There we simply apt-get install / yum install from packages.microsoft.com and the image is automatlically populated with latest PS This comment applies all locations where the MSI is downloaded |
||
| ARG POWERSHELL_SHA256=CC52D21F3287E412B9C3B73C98BB5B06F8056D49D63201072216DF92B7F2E59B | ||
|
Member
There was a problem hiding this comment. Not really required to validate the hash. The MSI is authenticode signed & you are downloading from an HTTPS location |
||
|
|
||
| # Prepare shell environment to Log-to > C:\Dockerfile.log | ||
| SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe","-command","$ErrorActionPreference = 'Stop';","$ConfirmPreference = 'None';",` | ||
| "$VerbosePreference = 'Continue';","Start-Transcript -path C:\\Dockerfile.log -append -IncludeInvocationHeader;","$PSVersionTable|Write-Output;",` | ||
| "$WinVer = $(Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion');",` | ||
| "$OsVer = $('OperatingSystem: '+ $WinVer.ProductName +' '+$WinVer.EditionId+' '+$WinVer.InstallationType);",` | ||
| "$BldVer = $('FullBuildString: '+ $WinVer.BuildLabEx); Write-Output -InputObject $OsVer,$BldVer; "] | ||
|
|
||
| # Install PowerShell package and clean up | ||
| ADD $POWERSHELL_MSI /PowerShell-win10-win2k16-x64.msi | ||
| RUN [System.IO.FileInfo]$MsiFile = Get-Item -Path ./PowerShell-win10-win2k16-x64.msi;` | ||
| [String]$MsiHash=(Get-FileHash -Path $MSiFile -Algorithm SHA256 | select -ExpandProperty Hash);` | ||
| If ($MsiHash -notmatch $Env:POWERSHELL_SHA256) {` | ||
| Throw [String]$('['+$MsiHash+'] does not match ['+$Env:POWERSHELL_SHA256+']!') ` | ||
| }` | ||
| $proc=Start-Process -FilePath msiexec.exe -ArgumentList '-qn','-i c:\PowerShell-win10-win2k16-x64.msi',` | ||
| '-log c:\PowerShell-win10-win2k16-x64.msi.log','-norestart' -wait -PassThru;` | ||
| If ($proc.ExitCode -eq 0) {` | ||
| Remove-Item -Path $MsiFile;` | ||
| $psexe=Get-Item -Path $Env:ProgramFiles\PowerShell\*\powershell.exe;` | ||
| Write-Host ('Successfully installed to '+$psexe);` | ||
| New-Item -Type SymbolicLink -Path $Env:ProgramFiles\PowerShell\ -Name Core ` | ||
| -Value $psexe.DirectoryName | Out-Null;` | ||
| $PSVersionTable | Export-Clixml -Path .\OsPsVer.clix;` | ||
| } else { throw 'Installation failed! See c:\PowerShell-win10-win2k16-x64.msi.log'} | ||
|
|
||
| # Verify New Powershell.exe runs | ||
| SHELL ["C:\\Program Files\\PowerShell\\Core\\powershell.exe","-command","$ErrorActionPreference='Stop';"] | ||
| RUN $PSVersionTable|Out-Host; $OsPsVer = Import-Clixml -Path .\OsPsVer.clix; Remove-Item -Path .\OsPsVer.clix;` | ||
| If ($PSVersionTable.PSEdition -ne 'Core') {Throw [String]$('['+$PSVersionTable.PSEdition+'] is not [Core]!')}` | ||
| If ($PSVersionTable.PSVersion -eq $OsPsVer.PSVersion) {Throw [String]$('['+$PSVersionTable.PSVersion+'] is unchanged...')}` | ||
| Write-Host "Hello World! PowerShell Core installation has been verfied." | ||
|
|
||
| SHELL ["CMD.EXE","/C"] | ||
| RUN del /q C:\Dockerfile.log &>c:\entrypoint.bat echo @echo off &>>c:\entrypoint.bat` | ||
| echo "C:\Program Files\PowerShell\Core\powershell.exe" -command $ErrorActionPreference='Stop';%* | ||
|
|
||
| ENTRYPOINT ["C:\\Program Files\\PowerShell\\Core\\powershell.exe","-noexit","-command","$ErrorActionPreference='Stop';"] | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Expand-Archive would simplify this. Here is an example.