Browse Source

trying to throw everything at the problem

pull/2068/head
kct949 1 year ago
parent
commit
020c7b4fa2
20 changed files with 40 additions and 8 deletions
  1. +1
    -0
      src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
  2. +3
    -0
      src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
  3. +2
    -2
      src/BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj
  4. +2
    -1
      src/Services/Basket/Basket.API/Basket.API.csproj
  5. +1
    -1
      src/Services/Basket/Basket.API/Dockerfile.develop
  6. +2
    -0
      src/Services/Catalog/Catalog.API/Dockerfile
  7. +1
    -1
      src/Services/Catalog/Catalog.API/Dockerfile.develop
  8. +1
    -0
      src/Services/Identity/Identity.API/Dockerfile
  9. +3
    -0
      src/Services/Ordering/Ordering.API/Dockerfile
  10. +1
    -1
      src/Services/Ordering/Ordering.API/Dockerfile.develop
  11. +2
    -0
      src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
  12. +1
    -1
      src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
  13. +2
    -0
      src/Services/Ordering/Ordering.SignalrHub/Dockerfile
  14. +3
    -0
      src/Services/Payment/Payment.API/Dockerfile
  15. +1
    -1
      src/Services/Payment/Payment.API/Dockerfile.develop
  16. +3
    -0
      src/Services/Webhooks/Webhooks.API/Dockerfile
  17. +3
    -0
      src/Web/WebMVC/Dockerfile
  18. +2
    -0
      src/Web/WebSPA/Dockerfile
  19. +3
    -0
      src/Web/WebStatus/Dockerfile
  20. +3
    -0
      src/Web/WebhookClient/Dockerfile

+ 1
- 0
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile View File

@ -4,6 +4,7 @@ EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running Mobile.Bff.Shopping"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds


+ 3
- 0
src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile View File

@ -1,3 +1,5 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
@ -5,6 +7,7 @@ EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running Web.Bff.Shopping"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds
COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWebApps.sln"


+ 2
- 2
src/BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj View File

@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Nullable>disable</Nullable>
</PropertyGroup>
<ItemGroup>
@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Autofac" Version="6.5.0" />
<PackageReference Include="Confluent.Kafka" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Polly" Version="7.2.3" />
</ItemGroup>


+ 2
- 1
src/Services/Basket/Basket.API/Basket.API.csproj View File

@ -13,7 +13,8 @@
</Content>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.5.0-beta.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
<PackageReference Include="AspNetCore.HealthChecks.AzureServiceBus" Version="6.0.4" />


+ 1
- 1
src/Services/Basket/Basket.API/Dockerfile.develop View File

@ -8,7 +8,7 @@ WORKDIR /src
COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
COPY ["BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj" "BuildingBlocks/EventBus/EventBusKafka/"]
COPY ["BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj", "BuildingBlocks/EventBus/EventBusKafka/"]
COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
COPY ["Services/Basket/Basket.API/Basket.API.csproj", "Services/Basket/Basket.API/"]
COPY ["NuGet.config", "NuGet.config"]


+ 2
- 0
src/Services/Catalog/Catalog.API/Dockerfile View File

@ -1,3 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
@ -6,6 +7,7 @@ EXPOSE 443
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running Catalog.API"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds
COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWebApps.sln"


+ 1
- 1
src/Services/Catalog/Catalog.API/Dockerfile.develop View File

@ -8,7 +8,7 @@ WORKDIR /src
COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
COPY ["BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj" "BuildingBlocks/EventBus/EventBusKafka/"]
COPY ["BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj", "BuildingBlocks/EventBus/EventBusKafka/"]
COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
COPY ["BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "BuildingBlocks/EventBus/IntegrationEventLogEF/"]
COPY ["BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "BuildingBlocks/WebHostCustomization/WebHost.Customization/"]


+ 1
- 0
src/Services/Identity/Identity.API/Dockerfile View File

@ -5,6 +5,7 @@ EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running Identity.API"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds
COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWebApps.sln"


+ 3
- 0
src/Services/Ordering/Ordering.API/Dockerfile View File

@ -1,3 +1,5 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
@ -5,6 +7,7 @@ EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running Ordering.API"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds
COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWebApps.sln"


+ 1
- 1
src/Services/Ordering/Ordering.API/Dockerfile.develop View File

@ -6,7 +6,7 @@ EXPOSE 80
WORKDIR /src
COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
COPY "BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj" "BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj"
COPY ["BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj", "BuildingBlocks/EventBus/EventBusKafka/"]
COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
COPY ["BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "BuildingBlocks/EventBus/IntegrationEventLogEF/"]


+ 2
- 0
src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile View File

@ -1,9 +1,11 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running Ordering.BackgroundTasks"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds


+ 1
- 1
src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj View File

@ -16,7 +16,7 @@
<PackageReference Include="Autofac" Version="6.5.0" />
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0-dev-00289" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.1-dev-00787" />


+ 2
- 0
src/Services/Ordering/Ordering.SignalrHub/Dockerfile View File

@ -1,9 +1,11 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running Ordering.SignalrHub"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds


+ 3
- 0
src/Services/Payment/Payment.API/Dockerfile View File

@ -1,9 +1,12 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running Payment.API"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds


+ 1
- 1
src/Services/Payment/Payment.API/Dockerfile.develop View File

@ -7,7 +7,7 @@ EXPOSE 80
WORKDIR /src
COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
COPY ["BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj" "BuildingBlocks/EventBus/EventBusKafka/"]
COPY ["BuildingBlocks/EventBus/EventBusKafka/EventBusKafka.csproj", "BuildingBlocks/EventBus/EventBusKafka/"]
COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
COPY ["BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "BuildingBlocks/EventBus/IntegrationEventLogEF/"]
COPY ["Services/Payment/Payment.API/Payment.API.csproj", "Services/Payment/Payment.API/"]


+ 3
- 0
src/Services/Webhooks/Webhooks.API/Dockerfile View File

@ -1,9 +1,12 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running Webhooks.API"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds


+ 3
- 0
src/Web/WebMVC/Dockerfile View File

@ -1,9 +1,12 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running WebMVC"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds


+ 2
- 0
src/Web/WebSPA/Dockerfile View File

@ -1,5 +1,6 @@
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
ARG NODE_IMAGE=node:12.0
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
@ -16,6 +17,7 @@ RUN npm run build:prod
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running WebSPA"'
# Create this "restore-solution" section by running ./Create-DockerfileSolutionRestore.ps1, to optimize build cache reuse
COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWebApps.sln"


+ 3
- 0
src/Web/WebStatus/Dockerfile View File

@ -1,9 +1,12 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running WebStatus"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds


+ 3
- 0
src/Web/WebhookClient/Dockerfile View File

@ -6,6 +6,9 @@ EXPOSE 443
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
RUN bash -c 'echo -e "Running WebhookClient"'
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
# to take advantage of Docker's build cache, to speed up local container builds
COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWebApps.sln"


Loading…
Cancel
Save