diff --git a/docs/en/CLI.md b/docs/en/CLI.md index ced5b5817f..06df019f78 100644 --- a/docs/en/CLI.md +++ b/docs/en/CLI.md @@ -50,7 +50,7 @@ abp new Acme.BookStore * `ef`: Entity Framework Core. * `mongodb`: MongoDB. * `module`: [Module template](Startup-Templates/Module.md). Additional options: - * `--no-ui`: Specifies to not include the UI. This makes possible to create service-only modules (a.k.a. microservices - without UI). + * `--no-ui`: Specifies to not include the UI. This makes possible to create service-only modules (a.k.a. microservices - without UI). * `--output-folder` or `-o`: Specifies the output folder. Default value is the current directory. * `--version` or `-v`: Specifies the ABP & template version. It can be a [release tag](https://github.com/abpframework/abp/releases) or a [branch name](https://github.com/abpframework/abp/branches). Uses the latest release if not specified. Most of the times, you will want to use the latest version. diff --git a/modules/docs/app/VoloDocs.Migrator/Dockerfile b/modules/docs/app/VoloDocs.Migrator/Dockerfile index 13554ea58a..655f973d95 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 49d1d70f46..108eaa2508 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 6813b756f7..3834cd2784 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 ca1caebbe8..e47ee48ec6 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 b1ff0b791a..d6e17624e1 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 4fe82ef81b..246a057f47 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 5444edb5a5..a19ca88454 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 82bb090408..755fe533de 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 dad3238039..cd6ac12152 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 8577b0d182..b0cec2c136 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 cb03220467..157ba781b6 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 5f3eee8618..2dc9af591d 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 05e601031c..100278ed73 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 14038ef487..1afc280e62 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 e716f68113..4f750c55b6 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 c5e3bcb0c1..1fcf761e8f 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 827af3a36f..b89e618a9c 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 2c5f24183d..8d0d75895a 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