From 929c8d461dba8a133e1e243d46e01b9c69552f5c Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 19 Oct 2022 11:48:15 +0300 Subject: [PATCH 1/3] updated modules' dockerfile tags --- modules/cms-kit/database/Dockerfile | 2 +- modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Dockerfile | 4 ++-- modules/cms-kit/host/Volo.CmsKit.IdentityServer/Dockerfile | 4 ++-- modules/docs/app/VoloDocs.Migrator/Dockerfile | 4 ++-- modules/docs/app/VoloDocs.Web/Dockerfile | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/cms-kit/database/Dockerfile b/modules/cms-kit/database/Dockerfile index 6257db9899..416308789f 100644 --- a/modules/cms-kit/database/Dockerfile +++ b/modules/cms-kit/database/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build COPY . . WORKDIR /templates/service/host/IdentityServerHost diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Dockerfile b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Dockerfile index c13abce9a3..7085e3d05f 100644 --- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Dockerfile +++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-buster-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build WORKDIR /src COPY . . WORKDIR /src/templates/service/host/Volo.CmsKit.HttpApi.Host diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Dockerfile b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Dockerfile index bc353a0abd..3386df7fc4 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Dockerfile +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-buster-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build WORKDIR /src COPY . . WORKDIR /src/templates/service/host/Volo.CmsKit.IdentityServer diff --git a/modules/docs/app/VoloDocs.Migrator/Dockerfile b/modules/docs/app/VoloDocs.Migrator/Dockerfile index 655f973d95..a752089450 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:3.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-buster-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.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 108eaa2508..a42cac39b0 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:3.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-buster-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build WORKDIR /src COPY . . WORKDIR "/src/modules/docs/app/VoloDocs.Web" From de90f9f98e9bd0aaad752a056b4ca9b6bdb2b2ce Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 19 Oct 2022 11:48:30 +0300 Subject: [PATCH 2/3] updated templates' dockerfile tags --- templates/module/aspnet-core/database/Dockerfile | 2 +- .../host/MyCompanyName.MyProjectName.AuthServer/Dockerfile | 4 ++-- .../host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/module/aspnet-core/database/Dockerfile b/templates/module/aspnet-core/database/Dockerfile index 1fcf761e8f..65c34718f8 100644 --- a/templates/module/aspnet-core/database/Dockerfile +++ b/templates/module/aspnet-core/database/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build COPY . . WORKDIR /templates/service/host/IdentityServerHost diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Dockerfile b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Dockerfile index 124bc510e6..13ee822fe9 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Dockerfile +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-buster-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build WORKDIR /src COPY . . WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.AuthServer 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 b89e618a9c..22e755798c 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 mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-buster-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build WORKDIR /src COPY . . WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.HttpApi.Host From a5fb6c43706e3d4d0e0a2fbbc611fb8e51bdb88a Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 19 Oct 2022 12:17:36 +0300 Subject: [PATCH 3/3] Used sdk 7.0 instead of buster --- modules/cms-kit/database/Dockerfile | 2 +- modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Dockerfile | 4 ++-- modules/cms-kit/host/Volo.CmsKit.IdentityServer/Dockerfile | 4 ++-- modules/docs/app/VoloDocs.Migrator/Dockerfile | 4 ++-- modules/docs/app/VoloDocs.Web/Dockerfile | 4 ++-- templates/module/aspnet-core/database/Dockerfile | 2 +- .../host/MyCompanyName.MyProjectName.AuthServer/Dockerfile | 4 ++-- .../host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/cms-kit/database/Dockerfile b/modules/cms-kit/database/Dockerfile index 416308789f..da4218105d 100644 --- a/modules/cms-kit/database/Dockerfile +++ b/modules/cms-kit/database/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0 AS build COPY . . WORKDIR /templates/service/host/IdentityServerHost diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Dockerfile b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Dockerfile index 7085e3d05f..b80dc1e7fe 100644 --- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Dockerfile +++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-bullseye-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0 AS build WORKDIR /src COPY . . WORKDIR /src/templates/service/host/Volo.CmsKit.HttpApi.Host diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Dockerfile b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Dockerfile index 3386df7fc4..739c9a5a16 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Dockerfile +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-bullseye-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0 AS build WORKDIR /src COPY . . WORKDIR /src/templates/service/host/Volo.CmsKit.IdentityServer diff --git a/modules/docs/app/VoloDocs.Migrator/Dockerfile b/modules/docs/app/VoloDocs.Migrator/Dockerfile index a752089450..b699f9d13a 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:7.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-bullseye-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0 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 a42cac39b0..daa02bea2d 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:7.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-bullseye-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0 AS build WORKDIR /src COPY . . WORKDIR "/src/modules/docs/app/VoloDocs.Web" diff --git a/templates/module/aspnet-core/database/Dockerfile b/templates/module/aspnet-core/database/Dockerfile index 65c34718f8..9a195c4cdc 100644 --- a/templates/module/aspnet-core/database/Dockerfile +++ b/templates/module/aspnet-core/database/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0 AS build COPY . . WORKDIR /templates/service/host/IdentityServerHost diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Dockerfile b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Dockerfile index 13ee822fe9..ba1f22a995 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Dockerfile +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-bullseye-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0 AS build WORKDIR /src COPY . . WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.AuthServer 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 22e755798c..fc9e00b4d4 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 mcr.microsoft.com/dotnet/core/aspnet:7.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/core/aspnet:7.0-bullseye-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:7.0-buster AS build +FROM mcr.microsoft.com/dotnet/core/sdk:7.0 AS build WORKDIR /src COPY . . WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.HttpApi.Host