Skip to content

Commit 9b1cc6c

Browse files
LaurentGoderreLaurentGoderre
committed
test
1 parent de7f87c commit 9b1cc6c

File tree

11 files changed

+34
-131
lines changed

11 files changed

+34
-131
lines changed

‎10/windows/nanoserver/Dockerfile‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
FROM microsoft/windowsservercore as download
1+
FROM microsoft/nanoserver
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

55
ENV NODE_VERSION 10.4.0
66

77
ENV GPG_VERSION 2.3.4
88

9-
RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
10-
Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -UseBasicParsing ; \
9+
RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -SslProtocol 'Tls12' -UseBasicParsing ; \
1110
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1211

1312
RUN @( \
@@ -23,7 +22,7 @@ RUN @( \
2322
) | foreach { \
2423
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
2524
} ; \
26-
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
25+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
2726
Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
2827
gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc ; \
2928
Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
@@ -34,7 +33,7 @@ RUN @( \
3433

3534
ENV YARN_VERSION 1.7.0
3635

37-
RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
36+
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
3837
Invoke-WebRequest $('https://yarnpkg.com/downloads/{0}/yarn-{0}.msi' -f $env:YARN_VERSION) -OutFile yarn.msi -UseBasicParsing ; \
3938
$sig = Get-AuthenticodeSignature -filepath yarn.msi ; \
4039
if ($sig.Status -ne 'Valid') { Write-Error 'Authenticode signature is not valid' } ; \
@@ -43,16 +42,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
4342
) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
4443
Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
4544

46-
FROM microsoft/nanoserver
47-
48-
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
49-
50-
ENV NODE_VERSION 10.4.0
51-
ENV YARN_VERSION 1.7.0
52-
53-
COPY --from=download /nodejs /nodejs
54-
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
55-
5645
RUN New-Item $($env:APPDATA + '\npm') -Type Directory ; \
5746
$env:PATH = 'C:\nodejs;{0}\npm;C:\yarn\bin;{1}' -f $env:APPDATA, $env:PATH ; \
5847
Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $env:PATH

‎10/windows/windowsservercore/Dockerfile‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/windowsservercore as download
1+
FROM microsoft/windowsservercore
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

@@ -43,16 +43,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
4343
) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
4444
Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
4545

46-
FROM microsoft/windowsservercore
47-
48-
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
49-
50-
ENV NODE_VERSION 10.4.0
51-
ENV YARN_VERSION 1.7.0
52-
53-
COPY --from=download /nodejs /nodejs
54-
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
55-
5646
RUN New-Item $($env:APPDATA + '\npm') -Type Directory ; \
5747
$env:PATH = 'C:\nodejs;{0}\npm;C:\yarn\bin;{1}' -f $env:APPDATA, $env:PATH ; \
5848
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)

‎6/windows/nanoserver/Dockerfile‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
FROM microsoft/windowsservercore as download
1+
FROM microsoft/nanoserver
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

55
ENV NODE_VERSION 6.14.2
66

77
ENV GPG_VERSION 2.3.4
88

9-
RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
10-
Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -UseBasicParsing ; \
9+
RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -SslProtocol 'Tls12' -UseBasicParsing ; \
1110
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1211

1312
RUN @( \
@@ -23,7 +22,7 @@ RUN @( \
2322
) | foreach { \
2423
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
2524
} ; \
26-
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
25+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
2726
Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
2827
gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc ; \
2928
Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
@@ -32,9 +31,9 @@ RUN @( \
3231
Expand-Archive node.zip -DestinationPath C:\ ; \
3332
Rename-Item -Path $('C:\node-v{0}-win-x64' -f $env:NODE_VERSION) -NewName 'C:\nodejs'
3433

35-
ENV YARN_VERSION 1.6.0
34+
ENV YARN_VERSION 1.7.0
3635

37-
RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
36+
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
3837
Invoke-WebRequest $('https://yarnpkg.com/downloads/{0}/yarn-{0}.msi' -f $env:YARN_VERSION) -OutFile yarn.msi -UseBasicParsing ; \
3938
$sig = Get-AuthenticodeSignature -filepath yarn.msi ; \
4039
if ($sig.Status -ne 'Valid') { Write-Error 'Authenticode signature is not valid' } ; \
@@ -43,16 +42,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
4342
) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
4443
Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
4544

46-
FROM microsoft/nanoserver
47-
48-
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
49-
50-
ENV NODE_VERSION 6.14.2
51-
ENV YARN_VERSION 1.6.0
52-
53-
COPY --from=download /nodejs /nodejs
54-
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
55-
5645
RUN New-Item $($env:APPDATA + '\npm') -Type Directory ; \
5746
$env:PATH = 'C:\nodejs;{0}\npm;C:\yarn\bin;{1}' -f $env:APPDATA, $env:PATH ; \
5847
Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $env:PATH

‎6/windows/windowsservercore/Dockerfile‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/windowsservercore as download
1+
FROM microsoft/windowsservercore
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

@@ -43,16 +43,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
4343
) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
4444
Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
4545

46-
FROM microsoft/windowsservercore
47-
48-
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
49-
50-
ENV NODE_VERSION 6.14.2
51-
ENV YARN_VERSION 1.6.0
52-
53-
COPY --from=download /nodejs /nodejs
54-
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
55-
5646
RUN New-Item $($env:APPDATA + '\npm') -Type Directory ; \
5747
$env:PATH = 'C:\nodejs;{0}\npm;C:\yarn\bin;{1}' -f $env:APPDATA, $env:PATH ; \
5848
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)

‎8/windows/nanoserver/Dockerfile‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
FROM microsoft/windowsservercore as download
1+
FROM microsoft/nanoserver
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

55
ENV NODE_VERSION 8.11.2
66

77
ENV GPG_VERSION 2.3.4
88

9-
RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
10-
Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -UseBasicParsing ; \
9+
RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -SslProtocol 'Tls12' -UseBasicParsing ; \
1110
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1211

1312
RUN @( \
@@ -23,7 +22,7 @@ RUN @( \
2322
) | foreach { \
2423
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
2524
} ; \
26-
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
25+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
2726
Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
2827
gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc ; \
2928
Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
@@ -34,7 +33,7 @@ RUN @( \
3433

3534
ENV YARN_VERSION 1.6.0
3635

37-
RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
36+
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
3837
Invoke-WebRequest $('https://yarnpkg.com/downloads/{0}/yarn-{0}.msi' -f $env:YARN_VERSION) -OutFile yarn.msi -UseBasicParsing ; \
3938
$sig = Get-AuthenticodeSignature -filepath yarn.msi ; \
4039
if ($sig.Status -ne 'Valid') { Write-Error 'Authenticode signature is not valid' } ; \
@@ -43,16 +42,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
4342
) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
4443
Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
4544

46-
FROM microsoft/nanoserver
47-
48-
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
49-
50-
ENV NODE_VERSION 8.11.2
51-
ENV YARN_VERSION 1.6.0
52-
53-
COPY --from=download /nodejs /nodejs
54-
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
55-
5645
RUN New-Item $($env:APPDATA + '\npm') -Type Directory ; \
5746
$env:PATH = 'C:\nodejs;{0}\npm;C:\yarn\bin;{1}' -f $env:APPDATA, $env:PATH ; \
5847
Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $env:PATH

‎8/windows/windowsservercore/Dockerfile‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/windowsservercore as download
1+
FROM microsoft/windowsservercore
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

@@ -43,16 +43,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
4343
) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
4444
Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
4545

46-
FROM microsoft/windowsservercore
47-
48-
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
49-
50-
ENV NODE_VERSION 8.11.2
51-
ENV YARN_VERSION 1.6.0
52-
53-
COPY --from=download /nodejs /nodejs
54-
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
55-
5646
RUN New-Item $($env:APPDATA + '\npm') -Type Directory ; \
5747
$env:PATH = 'C:\nodejs;{0}\npm;C:\yarn\bin;{1}' -f $env:APPDATA, $env:PATH ; \
5848
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)

‎9/windows/nanoserver/Dockerfile‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
FROM microsoft/windowsservercore as download
1+
FROM microsoft/nanoserver
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

55
ENV NODE_VERSION 9.11.1
66

77
ENV GPG_VERSION 2.3.4
88

9-
RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
10-
Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -UseBasicParsing ; \
9+
RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -SslProtocol 'Tls12' -UseBasicParsing ; \
1110
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1211

1312
RUN @( \
@@ -23,7 +22,7 @@ RUN @( \
2322
) | foreach { \
2423
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
2524
} ; \
26-
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
25+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
2726
Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
2827
gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc ; \
2928
Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
@@ -34,7 +33,7 @@ RUN @( \
3433

3534
ENV YARN_VERSION 1.5.1
3635

37-
RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
36+
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
3837
Invoke-WebRequest $('https://yarnpkg.com/downloads/{0}/yarn-{0}.msi' -f $env:YARN_VERSION) -OutFile yarn.msi -UseBasicParsing ; \
3938
$sig = Get-AuthenticodeSignature -filepath yarn.msi ; \
4039
if ($sig.Status -ne 'Valid') { Write-Error 'Authenticode signature is not valid' } ; \
@@ -43,16 +42,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
4342
) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
4443
Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
4544

46-
FROM microsoft/nanoserver
47-
48-
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
49-
50-
ENV NODE_VERSION 9.11.1
51-
ENV YARN_VERSION 1.5.1
52-
53-
COPY --from=download /nodejs /nodejs
54-
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
55-
5645
RUN New-Item $($env:APPDATA + '\npm') -Type Directory ; \
5746
$env:PATH = 'C:\nodejs;{0}\npm;C:\yarn\bin;{1}' -f $env:APPDATA, $env:PATH ; \
5847
Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $env:PATH

‎9/windows/windowsservercore/Dockerfile‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/windowsservercore as download
1+
FROM microsoft/windowsservercore
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

@@ -43,16 +43,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
4343
) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
4444
Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
4545

46-
FROM microsoft/windowsservercore
47-
48-
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
49-
50-
ENV NODE_VERSION 9.11.1
51-
ENV YARN_VERSION 1.5.1
52-
53-
COPY --from=download /nodejs /nodejs
54-
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
55-
5646
RUN New-Item $($env:APPDATA + '\npm') -Type Directory ; \
5747
$env:PATH = 'C:\nodejs;{0}\npm;C:\yarn\bin;{1}' -f $env:APPDATA, $env:PATH ; \
5848
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)

‎Dockerfile-nanoserver.template‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
FROM microsoft/windowsservercore as download
1+
FROM microsoft/nanoserver
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

55
ENV NODE_VERSION 0.0.0
66

77
ENV GPG_VERSION 2.3.4
88

9-
RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
10-
Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -UseBasicParsing ; \
9+
RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -SslProtocol 'Tls12' -UseBasicParsing ; \
1110
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1211

1312
RUN @( \
1413
"${NODE_KEYS[@]}"
1514
) | foreach { \
1615
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
1716
} ; \
18-
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
17+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
1918
Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
2019
gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc ; \
2120
Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
@@ -26,7 +25,7 @@ RUN @( \
2625

2726
ENV YARN_VERSION 0.0.0
2827

29-
RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 ; \
28+
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
3029
Invoke-WebRequest $('https://yarnpkg.com/downloads/{0}/yarn-{0}.msi' -f $env:YARN_VERSION) -OutFile yarn.msi -UseBasicParsing ; \
3130
$sig = Get-AuthenticodeSignature -filepath yarn.msi ; \
3231
if ($sig.Status -ne 'Valid') { Write-Error 'Authenticode signature is not valid' } ; \
@@ -35,16 +34,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
3534
) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
3635
Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
3736

38-
FROM microsoft/nanoserver
39-
40-
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
41-
42-
ENV NODE_VERSION 0.0.0
43-
ENV YARN_VERSION 0.0.0
44-
45-
COPY --from=download /nodejs /nodejs
46-
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
47-
4837
RUN New-Item $($env:APPDATA + '\npm') -Type Directory ; \
4938
$env:PATH = 'C:\nodejs;{0}\npm;C:\yarn\bin;{1}' -f $env:APPDATA, $env:PATH ; \
5039
Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $env:PATH

‎Dockerfile-windowsservercore.template‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/windowsservercore as download
1+
FROM microsoft/windowsservercore
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

@@ -35,16 +35,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
3535
) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
3636
Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
3737

38-
FROM microsoft/windowsservercore
39-
40-
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
41-
42-
ENV NODE_VERSION 0.0.0
43-
ENV YARN_VERSION 0.0.0
44-
45-
COPY --from=download /nodejs /nodejs
46-
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
47-
4838
RUN New-Item $($env:APPDATA + '\npm') -Type Directory ; \
4939
$env:PATH = 'C:\nodejs;{0}\npm;C:\yarn\bin;{1}' -f $env:APPDATA, $env:PATH ; \
5040
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)

0 commit comments

Comments
 (0)