Skip to content

Commit 0ec56c1

Browse files
committed
move docker file changes from buildfeb2020 branch
1 parent c485f58 commit 0ec56c1

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

tools/releaseBuild/Image/DockerFile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# escape=`
22
#0.3.6 (no powershell 6)
33
# FROM microsoft/windowsservercore
4-
FROM microsoft/dotnet-framework:4.7.1
4+
FROM mcr.microsoft.com/dotnet/framework/sdk:4.8
55
LABEL maintainer='PowerShell Team <powershellteam@hotmail.com>'
66
LABEL description="This Dockerfile for Windows Server Core with git installed via chocolatey."
77

@@ -14,19 +14,20 @@ COPY dockerInstall.psm1 containerFiles/dockerInstall.psm1
1414
RUN Import-Module PackageManagement; `
1515
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force; `
1616
Import-Module ./containerFiles/dockerInstall.psm1; `
17+
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12; `
1718
Install-ChocolateyPackage -PackageName git -Executable git.exe; `
1819
Install-ChocolateyPackage -PackageName nuget.commandline -Executable nuget.exe -Cleanup; `
1920
Install-Module -Force -Name platyPS -Repository PSGallery; `
2021
Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1 -outfile C:/dotnet-install.ps1; `
2122
C:/dotnet-install.ps1 -Channel Release -Version 2.1.4; `
2223
Add-Path C:/Users/ContainerAdministrator/AppData/Local/Microsoft/dotnet;
2324

24-
RUN Import-Module ./containerFiles/dockerInstall.psm1; `
25+
#RUN Import-Module ./containerFiles/dockerInstall.psm1; `
2526
# git clone https://Github.com/PowerShell/PSScriptAnalyzer; `
26-
Install-ChocolateyPackage -PackageName dotnet4.5;
27+
# Install-ChocolateyPackage -PackageName dotnet4.5;
2728

28-
RUN Import-Module ./containerFiles/dockerInstall.psm1; `
29-
Install-ChocolateyPackage -PackageName netfx-4.5.2-devpack;
29+
#RUN Import-Module ./containerFiles/dockerInstall.psm1; `
30+
# Install-ChocolateyPackage -PackageName netfx-4.5.2-devpack;
3031

3132
COPY buildPSSA.ps1 containerFiles/buildPSSA.ps1
3233

0 commit comments

Comments
 (0)