Remove nanoserver-sac2016 Dockerfiles and add 1.* nanoserver-1809 Doc…

…kerfiles (dotnet#957)

.vsts-pipelines/jobs/build-test-publish-repo.yml

@@ -51,14 +51,6 @@ jobs:
     matrix: dependencies.GenerateMatrices.outputs['buildMatrix.buildMatrixLinuxArm32v7']
     dockerClientOS: linux
     useRemoteDockerServer: true
-- template: build-images.yml
-  parameters:
-    name: Build_NanoServerSac2016_amd64
-    pool: # windowsLtsc2016Amd64Pool
-      name: DotNetCore-Infra
-      demands: VSTS_OS -equals Windows_Server_2016_Data_Center_with_Containers
-    matrix: dependencies.GenerateMatrices.outputs['buildMatrix.buildMatrixNanoserverSac2016Amd64']
-    dockerClientOS: windows
 - template: build-images.yml
   parameters:
     name: Build_NanoServer1709_amd64
@@ -131,14 +123,6 @@ jobs:
       - RemoteDockerServerArch -equals arm32v7
     matrix: dependencies.GenerateMatrices.outputs['testMatrix.testMatrixLinuxArm32v7']
     useRemoteDockerServer: true
-- template: test-images-windows-client.yml
-  parameters:
-    name: Test_NanoServerSac2016_amd64
-    buildDependencies: Build_NanoServerSac2016_amd64
-    pool: # windowsLtsc2016Amd64Pool
-      name: DotNetCore-Infra
-      demands: VSTS_OS -equals Windows_Server_2016_Data_Center_with_Containers
-    matrix: dependencies.GenerateMatrices.outputs['testMatrix.testMatrixNanoserverSac2016Amd64']
 - template: test-images-windows-client.yml
   parameters:
     name: Test_NanoServer1709_amd64

.vsts-pipelines/jobs/copy-images.yml

@@ -17,7 +17,6 @@ jobs:
               eq(variables['singlePhase'], ''),
               succeeded('Build_Linux_amd64'),
               succeeded('Build_Linux_arm32v7'),
-              succeeded('Build_NanoServerSac2016_amd64'),
               succeeded('Build_NanoServer1709_amd64'),
               succeeded('Build_NanoServer1803_amd64'),
               succeeded('Build_NanoServer1809_amd64'),
@@ -27,7 +26,6 @@ jobs:
   - Test_Linux_amd64
   - Test_Linux_arm64v8
   - Test_Linux_arm32v7
-  - Test_NanoServerSac2016_amd64
   - Test_NanoServer1709_amd64
   - Test_NanoServer1803_amd64
   - Test_NanoServer1809_amd64

1.0/runtime/nanoserver-1809/amd64/Dockerfile

@@ -0,0 +1,25 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:1809 AS installer
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# Retrieve .NET Core Runtime
+ENV DOTNET_VERSION 1.0.14
+
+RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$Env:DOTNET_VERSION/dotnet-win-x64.$Env:DOTNET_VERSION.zip; `
+    $dotnet_sha512 = '42cbfdb97e75e84b075afeb4c943fcf2697f3f0c2d4a5541dead23e6b9d3954a5eff465a4d0b73393257151a905fadb3b022ce883e44d72448f25707218c54f2'; `
+    Expand-Archive dotnet.zip -DestinationPath dotnet; `
+    Remove-Item -Force dotnet.zip
+
+
+# Runtime image
+FROM mcr.microsoft.com/windows/nanoserver:1809
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator 
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+USER ContainerUser

1.1/runtime/nanoserver-1809/amd64/Dockerfile

@@ -0,0 +1,25 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:1809 AS installer
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# Retrieve .NET Core Runtime
+ENV DOTNET_VERSION 1.1.11
+
+RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$Env:DOTNET_VERSION/dotnet-win-x64.$Env:DOTNET_VERSION.zip; `
+    $dotnet_sha512 = '42cbfdb97e75e84b075afeb4c943fcf2697f3f0c2d4a5541dead23e6b9d3954a5eff465a4d0b73393257151a905fadb3b022ce883e44d72448f25707218c54f2'; `
+    Expand-Archive dotnet.zip -DestinationPath dotnet; `
+    Remove-Item -Force dotnet.zip
+
+
+# Runtime image
+FROM mcr.microsoft.com/windows/nanoserver:1809
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator 
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+USER ContainerUser

1.1/sdk/nanoserver-1809/amd64/Dockerfile

@@ -0,0 +1,27 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:1809 AS installer
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# Install .NET Core SDK
+ENV DOTNET_SDK_VERSION 1.1.12
+
+RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$Env:DOTNET_SDK_VERSION/dotnet-dev-win-x64.$Env:DOTNET_SDK_VERSION.zip; `
+    Expand-Archive dotnet.zip -DestinationPath dotnet; `
+    Remove-Item -Force dotnet.zip
+
+
+# SDK image
+FROM mcr.microsoft.com/windows/nanoserver:1809
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator 
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+USER ContainerUser
+
+# Trigger first run experience by running arbitrary cmd to populate local package cache
+RUN dotnet help

README.aspnet.md

@@ -109,11 +109,6 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn
 
 - [`3.0.0-preview3-nanoserver-1709`, `3.0-nanoserver-1709`, `3.0.0-preview3`, `3.0` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/nanoserver-1709/amd64/Dockerfile)
 
-## Windows Server 2016 amd64 tags
-
-- [`2.2.3-nanoserver-sac2016`, `2.2-nanoserver-sac2016`, `2.2.3`, `2.2`, `latest` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/nanoserver-sac2016/amd64/Dockerfile)
-- [`2.1.9-nanoserver-sac2016`, `2.1-nanoserver-sac2016`, `2.1.9`, `2.1` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-sac2016/amd64/Dockerfile)
-
 ## Windows Server, version 1809 arm32 tags
 
 - [`2.2.3-nanoserver-1809-arm32`, `2.2-nanoserver-1809-arm32`, `2.2.3`, `2.2`, `latest` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/nanoserver-1809/arm32/Dockerfile)

README.runtime.md

@@ -85,6 +85,8 @@ docker run --rm mcr.microsoft.com/dotnet/core/samples
 
 - [`2.2.3-nanoserver-1809`, `2.2-nanoserver-1809`, `2.2.3`, `2.2`, `latest` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/nanoserver-1809/amd64/Dockerfile)
 - [`2.1.9-nanoserver-1809`, `2.1-nanoserver-1809`, `2.1.9`, `2.1` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1809/amd64/Dockerfile)
+- [`1.1.11-nanoserver-1809`, `1.1-nanoserver-1809`, `1.1.11`, `1.1` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/1.1/runtime/nanoserver-1809/amd64/Dockerfile)
+- [`1.0.14-nanoserver-1809`, `1.0-nanoserver-1809`, `1.0.14`, `1.0` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/1.0/runtime/nanoserver-1809/amd64/Dockerfile)
 
 **.NET Core 3.0 Preview tags**
 
@@ -108,13 +110,6 @@ docker run --rm mcr.microsoft.com/dotnet/core/samples
 
 - [`3.0.0-preview3-nanoserver-1709`, `3.0-nanoserver-1709`, `3.0.0-preview3`, `3.0` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/nanoserver-1709/amd64/Dockerfile)
 
-## Windows Server 2016 amd64 tags
-
-- [`2.2.3-nanoserver-sac2016`, `2.2-nanoserver-sac2016`, `2.2.3`, `2.2`, `latest` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/nanoserver-sac2016/amd64/Dockerfile)
-- [`2.1.9-nanoserver-sac2016`, `2.1-nanoserver-sac2016`, `2.1.9`, `2.1` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-sac2016/amd64/Dockerfile)
-- [`1.1.11-nanoserver-sac2016`, `1.1-nanoserver-sac2016`, `1.1.11`, `1.1` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/1.1/runtime/nanoserver-sac2016/amd64/Dockerfile)
-- [`1.0.14-nanoserver-sac2016`, `1.0-nanoserver-sac2016`, `1.0.14`, `1.0` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/1.0/runtime/nanoserver-sac2016/amd64/Dockerfile)
-
 ## Windows Server, version 1809 arm32 tags
 
 - [`2.2.3-nanoserver-1809-arm32`, `2.2-nanoserver-1809-arm32`, `2.2.3`, `2.2`, `latest` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/nanoserver-1809/arm32/Dockerfile)

README.samples.md

@@ -83,11 +83,6 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn
 - [`dotnetapp-nanoserver-1709`, `dotnetapp`, `latest` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile)
 - [`aspnetapp-nanoserver-1709`, `aspnetapp` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile)
 
-## Windows Server 2016 amd64 tags
-
-- [`dotnetapp-nanoserver-sac2016`, `dotnetapp`, `latest` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile)
-- [`aspnetapp-nanoserver-sac2016`, `aspnetapp` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile)
-
 ## Windows Server, version 1809 amd32 tags
 
 - [`dotnetapp-nanoserver-1809-arm32`, `dotnetapp`, `latest` (*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile)