Update preview samples to 2.2; fix broken Dockerfile.basic-preview li…

…nks (#781)
dotnet · Nov 2, 2018 · d8855c5 · d8855c5
1 parent a87dd0c
commit d8855c5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -145,8 +145,8 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast
 
 ### ARM32 / Raspberry Pi
 
-* [.NET Core ARM32 Docker Sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/dotnet-docker-arm32.md) - This [sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile.basic-preview) builds and runs an application with Debian on ARM32 (works on Raspberry Pi).
-* [ASP.NET Core ARM32 Docker Sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/README.md) - This [sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile.preview) builds and runs an ASP.NET Core application with Debian on ARM32 (works on Raspberry Pi).
+* [.NET Core ARM32 Docker Sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/dotnet-docker-arm32.md) - This [sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile) builds and runs an application with Debian on ARM32 (works on Raspberry Pi).
+* [ASP.NET Core ARM32 Docker Sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/README.md) - This [sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile) builds and runs an ASP.NET Core application with Debian on ARM32 (works on Raspberry Pi).
 
 ## Image variants
 

diff --git a/samples/aspnetapp/Dockerfile.preview b/samples/aspnetapp/Dockerfile.preview
@@ -1,6 +1,5 @@
 # This Dockerfile uses nightly preview builds for .NET Core
-# It will be updated to .NET Core 2.2 shortly
-FROM microsoft/dotnet-nightly:2.1-sdk AS build
+FROM microsoft/dotnet-nightly:2.2-sdk AS build
 WORKDIR /app
 
 # copy csproj and restore as distinct layers
@@ -14,7 +13,7 @@ WORKDIR /app/aspnetapp
 RUN dotnet publish -c Release -o out
 
 
-FROM microsoft/dotnet-nightly:2.1-aspnetcore-runtime AS runtime
+FROM microsoft/dotnet-nightly:2.2-aspnetcore-runtime AS runtime
 WORKDIR /app
 COPY --from=build /app/aspnetapp/out ./
 ENTRYPOINT ["dotnet", "aspnetapp.dll"]
diff --git a/samples/aspnetapp/aspnetcore-docker-arm32.md b/samples/aspnetapp/aspnetcore-docker-arm32.md
@@ -10,7 +10,7 @@ See [.NET Core and Docker for ARM64](dotnet-docker-arm64.md) if you are interest
 
 ## Try a pre-built ASP.NET Core Docker Image
 
-You can quickly run a container with a pre-built [sample ASP.NET Core Docker image](https://hub.docker.com/r/microsoft/dotnet-samples/), based on this [sample](Dockerfile.preview).
+You can quickly run a container with a pre-built [sample ASP.NET Core Docker image](https://hub.docker.com/r/microsoft/dotnet-samples/), based on this [sample](Dockerfile).
 
 Type the following command to run a sample with [Docker](https://www.docker.com/products/docker):
 

diff --git a/samples/dotnetapp/Dockerfile.preview b/samples/dotnetapp/Dockerfile.preview
@@ -1,6 +1,5 @@
 # This Dockerfile uses nightly preview builds for .NET Core
-# It will be updated to .NET Core 2.2 shortly
-FROM microsoft/dotnet-nightly:2.1-sdk AS build
+FROM microsoft/dotnet-nightly:2.2-sdk AS build
 WORKDIR /app
 
 # copy csproj and restore as distinct layers
@@ -24,7 +23,7 @@ COPY tests/. .
 ENTRYPOINT ["dotnet", "test", "--logger:trx"]
 
 
-FROM microsoft/dotnet-nightly:2.1-runtime AS runtime
+FROM microsoft/dotnet-nightly:2.2-runtime AS runtime
 WORKDIR /app
 COPY --from=build /app/dotnetapp/out ./
 ENTRYPOINT ["dotnet", "dotnetapp.dll"]
diff --git a/samples/dotnetapp/dotnet-docker-arm32.md b/samples/dotnetapp/dotnet-docker-arm32.md
@@ -12,7 +12,7 @@ See [.NET Core and Docker for ARM64](dotnet-docker-arm64.md) if you are interest
 
 ## Try a pre-built .NET Core Docker Image
 
-You can quickly run a container with a pre-built [.NET Core Docker image](https://hub.docker.com/r/microsoft/dotnet-samples/), based on this [sample](Dockerfile.basic-preview).
+You can quickly run a container with a pre-built [.NET Core Docker image](https://hub.docker.com/r/microsoft/dotnet-samples/), based on this [sample](Dockerfile).
 
 Type the following [Docker](https://www.docker.com/products/docker) command:
 

diff --git a/samples/dotnetapp/dotnetapp.sln b/samples/dotnetapp/dotnetapp.sln
@@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Dockerfile.alpine-x64 = Dockerfile.alpine-x64
 		Dockerfile.alpine-x64-globalization = Dockerfile.alpine-x64-globalization
 		Dockerfile.basic = Dockerfile.basic
-		Dockerfile.basic-preview = Dockerfile.basic-preview
 		Dockerfile.debian-arm32-selfcontained = Dockerfile.debian-arm32-selfcontained
 		Dockerfile.debian-x64-selfcontained = Dockerfile.debian-x64-selfcontained
 		Dockerfile.nanoserver-x64-selfcontained = Dockerfile.nanoserver-x64-selfcontained