From ef0aab0afe1006d5c4a67ae705fb94ce003babc0 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 21 Oct 2019 17:59:11 +0800
Subject: [PATCH] Make Dockerfile support asp net core 3.0

---
 modules/docs/app/VoloDocs.Migrator/Dockerfile                 | 4 ++--
 modules/docs/app/VoloDocs.Web/Dockerfile                      | 4 ++--
 .../modules/book-management/database/Dockerfile               | 2 +-
 .../Acme.BookStore.BookManagement.HttpApi.Host/Dockerfile     | 4 ++--
 .../Acme.BookStore.BookManagement.IdentityServer/Dockerfile   | 4 ++--
 .../MicroserviceDemo/applications/AuthServer.Host/Dockerfile  | 4 ++--
 .../applications/BackendAdminApp.Host/Dockerfile              | 4 ++--
 .../applications/PublicWebSite.Host/Dockerfile                | 4 ++--
 samples/MicroserviceDemo/databases/Dockerfile                 | 2 +-
 .../gateways/BackendAdminAppGateway.Host/Dockerfile           | 4 ++--
 .../MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile | 4 ++--
 .../gateways/PublicWebSiteGateway.Host/Dockerfile             | 4 ++--
 .../microservices/BloggingService.Host/Dockerfile             | 4 ++--
 .../microservices/IdentityService.Host/Dockerfile             | 4 ++--
 .../microservices/ProductService.Host/Dockerfile              | 4 ++--
 templates/module/aspnet-core/database/Dockerfile              | 2 +-
 .../host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile  | 4 ++--
 .../MyCompanyName.MyProjectName.IdentityServer/Dockerfile     | 4 ++--
 18 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/modules/docs/app/VoloDocs.Migrator/Dockerfile b/modules/docs/app/VoloDocs.Migrator/Dockerfile
index 13554ea58a2..655f973d95b 100644
--- a/modules/docs/app/VoloDocs.Migrator/Dockerfile
+++ b/modules/docs/app/VoloDocs.Migrator/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:2.2-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/modules/docs/app/VoloDocs.Migrator"
diff --git a/modules/docs/app/VoloDocs.Web/Dockerfile b/modules/docs/app/VoloDocs.Web/Dockerfile
index 49d1d70f46b..108eaa25088 100644
--- a/modules/docs/app/VoloDocs.Web/Dockerfile
+++ b/modules/docs/app/VoloDocs.Web/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:2.2-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/modules/docs/app/VoloDocs.Web"
diff --git a/samples/BookStore-Modular/modules/book-management/database/Dockerfile b/samples/BookStore-Modular/modules/book-management/database/Dockerfile
index 6813b756f7b..3834cd27848 100644
--- a/samples/BookStore-Modular/modules/book-management/database/Dockerfile
+++ b/samples/BookStore-Modular/modules/book-management/database/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 COPY . .
 
 WORKDIR /templates/service/host/IdentityServerHost
diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Dockerfile b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Dockerfile
index ca1caebbe88..e47ee48ec66 100644
--- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Dockerfile
+++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/templates/service/host/Acme.BookStore.BookManagement.HttpApi.Host
diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Dockerfile b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Dockerfile
index b1ff0b791a0..d6e17624e1a 100644
--- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Dockerfile
+++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/templates/service/host/Acme.BookStore.BookManagement.IdentityServer
diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Dockerfile b/samples/MicroserviceDemo/applications/AuthServer.Host/Dockerfile
index 4fe82ef81b3..246a057f478 100644
--- a/samples/MicroserviceDemo/applications/AuthServer.Host/Dockerfile
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/samples/MicroserviceDemo/applications/AuthServer.Host"
diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Dockerfile b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Dockerfile
index 5444edb5a55..a19ca88454e 100644
--- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Dockerfile
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/samples/MicroserviceDemo/applications/BackendAdminApp.Host"
diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Dockerfile b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Dockerfile
index 82bb090408d..755fe533de6 100644
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Dockerfile
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/samples/MicroserviceDemo/applications/PublicWebSite.Host"
diff --git a/samples/MicroserviceDemo/databases/Dockerfile b/samples/MicroserviceDemo/databases/Dockerfile
index dad32380393..cd6ac121524 100644
--- a/samples/MicroserviceDemo/databases/Dockerfile
+++ b/samples/MicroserviceDemo/databases/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 RUN apk add --no-cache bash
 WORKDIR /src
 COPY . .
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Dockerfile b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Dockerfile
index 8577b0d1824..b0cec2c136e 100644
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Dockerfile
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host"
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile
index cb03220467e..157ba781b60 100644
--- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/samples/MicroserviceDemo/gateways/InternalGateway.Host"
diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Dockerfile b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Dockerfile
index 5f3eee86188..2dc9af591d9 100644
--- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Dockerfile
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host"
diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Dockerfile b/samples/MicroserviceDemo/microservices/BloggingService.Host/Dockerfile
index 05e601031cb..100278ed738 100644
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Dockerfile
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/samples/MicroserviceDemo/microservices/BloggingService.Host"
diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Dockerfile b/samples/MicroserviceDemo/microservices/IdentityService.Host/Dockerfile
index 14038ef4878..1afc280e628 100644
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Dockerfile
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/samples/MicroserviceDemo/microservices/IdentityService.Host"
diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Dockerfile b/samples/MicroserviceDemo/microservices/ProductService.Host/Dockerfile
index e716f68113a..4f750c55b6b 100644
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/Dockerfile
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR "/src/samples/MicroserviceDemo/microservices/ProductService.Host"
diff --git a/templates/module/aspnet-core/database/Dockerfile b/templates/module/aspnet-core/database/Dockerfile
index c5e3bcb0c12..1fcf761e8f3 100644
--- a/templates/module/aspnet-core/database/Dockerfile
+++ b/templates/module/aspnet-core/database/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 COPY . .
 
 WORKDIR /templates/service/host/IdentityServerHost
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile
index 827af3a36f3..b89e618a9ca 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.HttpApi.Host
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Dockerfile b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Dockerfile
index 2c5f24183dd..8d0d75895a4 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Dockerfile
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.IdentityServer