From f6c2f5672a59a78a6ec8220b169ca021285ae20a Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Wed, 10 Apr 2019 13:54:06 +0100 Subject: [PATCH 1/9] WIP - Testing approaches --- .dockerignore | 10 ++++-- .gitignore | 3 ++ Dockerfile-scripts/restore-packages | 3 ++ restore-packages.cmd | 1 + src/Services/Ordering/Ordering.API/Dockerfile | 31 ++++++++++--------- 5 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 Dockerfile-scripts/restore-packages create mode 100644 restore-packages.cmd diff --git a/.dockerignore b/.dockerignore index dd3d41423..7e89668a3 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,7 +7,6 @@ docker-compose*.yml docker-compose.dcproj *.sln -!eShopOnContainers-ServicesAndWebApps.sln *.md hosts LICENSE @@ -31,4 +30,11 @@ cli-linux **/wwwroot/lib/* global.json **/appsettings.localhost.json -src/Web/WebSPA/wwwroot/ \ No newline at end of file +src/Web/WebSPA/wwwroot/ +packages/ +csproj-files/ +test-results/ +TestResults/ +src/Mobile/ +src/Web/Catalog.WebForms/ +src/Web/WebMonolithic/ diff --git a/.gitignore b/.gitignore index 8bad337c5..8f5d1ce45 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,9 @@ bld/ # Visual Studio 2015 cache/options directory .vs/ +# Dockerfile projects folder for restore-packages script +csproj-files/ + # .js files created on build: src/Web/WebMVC/wwwroot/js/site* diff --git a/Dockerfile-scripts/restore-packages b/Dockerfile-scripts/restore-packages new file mode 100644 index 000000000..1f97db3f3 --- /dev/null +++ b/Dockerfile-scripts/restore-packages @@ -0,0 +1,3 @@ +#!/bin/bash + +for f in *.csproj; do dotnet restore --no-dependencies ../csproj-files/$f; done diff --git a/restore-packages.cmd b/restore-packages.cmd new file mode 100644 index 000000000..4e99614d6 --- /dev/null +++ b/restore-packages.cmd @@ -0,0 +1 @@ +for /R %%f in (*.csproj) do dotnet restore --no-dependencies %%f diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index 96aa10404..ce6ba50fa 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/src/Services/Ordering/Ordering.API/Dockerfile @@ -4,21 +4,24 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY . . -WORKDIR /src/src/Services/Ordering/Ordering.API -RUN dotnet restore -nowarn:msb3202,nu1503 -RUN dotnet build --no-restore -c Release -o /app +COPY **/*.csproj csproj-files/ +# WORKDIR /src/Dockerfile-scripts +# RUN restore-packages +# COPY . . +# WORKDIR /src/src/Services/Ordering/Ordering.API +# RUN dotnet restore -nowarn:msb3202,nu1503 +# RUN dotnet build --no-restore -c Release -o /app -FROM build as functionaltest -WORKDIR /src/src/Services/Ordering/Ordering.FunctionalTests +# FROM build as functionaltest +# WORKDIR /src/src/Services/Ordering/Ordering.FunctionalTests -FROM build as unittest -WORKDIR /src/src/Services/Ordering/Ordering.UnitTests +# FROM build as unittest +# WORKDIR /src/src/Services/Ordering/Ordering.UnitTests -FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app +# FROM build AS publish +# RUN dotnet publish --no-restore -c Release -o /app -FROM base AS final -WORKDIR /app -COPY --from=publish /app . -ENTRYPOINT ["dotnet", "Ordering.API.dll"] +# FROM base AS final +# WORKDIR /app +# COPY --from=publish /app . +# ENTRYPOINT ["dotnet", "Ordering.API.dll"] From be75d554f26de1af53aa37734c5a60511d25f47d Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Fri, 12 Apr 2019 19:45:45 +0100 Subject: [PATCH 2/9] Inital Dockerfiles --- .dockerignore | 2 + Dockerfile-scripts/restore-packages | 2 +- src/ApiGateways/ApiGw-Base/Dockerfile | 34 +++++++++- .../Mobile.Bff.Shopping/aggregator/Dockerfile | 32 ++++++++- .../Web.Bff.Shopping/aggregator/Dockerfile | 32 ++++++++- src/Services/Basket/Basket.API/Dockerfile | 38 +++++++++-- src/Services/Catalog/Catalog.API/Dockerfile | 32 ++++++++- src/Services/Identity/Identity.API/Dockerfile | 32 ++++++++- .../Location/Locations.API/Dockerfile | 32 ++++++++- .../Marketing/Marketing.API/Dockerfile | 32 ++++++++- src/Services/Ordering/Ordering.API/Dockerfile | 67 +++++++++++++------ .../Ordering.BackgroundTasks/Dockerfile | 32 ++++++++- .../Ordering/Ordering.SignalrHub/Dockerfile | 34 +++++++++- src/Services/Payment/Payment.API/Dockerfile | 32 ++++++++- src/Services/Webhooks/Webhooks.API/Dockerfile | 35 ++++++++-- src/Web/WebMVC/Dockerfile | 33 ++++++++- src/Web/WebSPA/Dockerfile | 42 ++++++++++-- src/Web/WebStatus/Dockerfile | 32 ++++++++- src/Web/WebhookClient/Dockerfile | 37 ++++++++-- src/csproj-files.txt | 34 ++++++++++ 20 files changed, 577 insertions(+), 69 deletions(-) create mode 100644 src/csproj-files.txt diff --git a/.dockerignore b/.dockerignore index 7e89668a3..5fbf98f1e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -38,3 +38,5 @@ TestResults/ src/Mobile/ src/Web/Catalog.WebForms/ src/Web/WebMonolithic/ +src/BuildingBlocks/CommandBus/ +src/Services/Marketing/Infrastructure/ \ No newline at end of file diff --git a/Dockerfile-scripts/restore-packages b/Dockerfile-scripts/restore-packages index 1f97db3f3..f0a8623d2 100644 --- a/Dockerfile-scripts/restore-packages +++ b/Dockerfile-scripts/restore-packages @@ -1,3 +1,3 @@ #!/bin/bash -for f in *.csproj; do dotnet restore --no-dependencies ../csproj-files/$f; done +for f in $(find /src/src -type f -name "*.csproj"); do dotnet restore $f; done diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile b/src/ApiGateways/ApiGw-Base/Dockerfile index ed6d75229..20373e2bf 100644 --- a/src/ApiGateways/ApiGw-Base/Dockerfile +++ b/src/ApiGateways/ApiGw-Base/Dockerfile @@ -4,13 +4,41 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/ApiGateways/ApiGw-Base/ -RUN dotnet restore -nowarn:msb3202,nu1503 -RUN dotnet build -c Release -o /app +RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile index d25a98e6c..1e633c2b4 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile @@ -4,13 +4,41 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator -RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile index 75aa0f507..2a8a7af36 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile @@ -4,13 +4,41 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator -RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index af5c31654..41f9885d8 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/src/Services/Basket/Basket.API/Dockerfile @@ -4,19 +4,47 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/Services/Basket/Basket.API -RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet build --no-restore -c Release -o /app -FROM build as functionaltest -WORKDIR /src/src/Services/Basket/Basket.FunctionalTests - FROM build as unittest WORKDIR /src/src/Services/Basket/Basket.UnitTests +FROM build as functionaltest +WORKDIR /src/src/Services/Basket/Basket.FunctionalTests + FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index 317146c0c..756ac0020 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/src/Services/Catalog/Catalog.API/Dockerfile @@ -4,9 +4,38 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/Services/Catalog/Catalog.API -RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet build --no-restore -c Release -o /app FROM build as unittest @@ -16,7 +45,6 @@ FROM build as functionaltest WORKDIR /src/src/Services/Catalog/Catalog.FunctionalTests FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index af45d8da8..d0ce0bc80 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -4,13 +4,41 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/Services/Identity/Identity.API -RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Services/Location/Locations.API/Dockerfile b/src/Services/Location/Locations.API/Dockerfile index c33f6b9c4..cc631de8e 100644 --- a/src/Services/Location/Locations.API/Dockerfile +++ b/src/Services/Location/Locations.API/Dockerfile @@ -4,16 +4,44 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/Services/Location/Locations.API -RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet build --no-restore -c Release -o /app FROM build as functionaltest WORKDIR /src/src/Services/Location/Locations.FunctionalTests FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Services/Marketing/Marketing.API/Dockerfile b/src/Services/Marketing/Marketing.API/Dockerfile index abcd1c631..0f061beea 100644 --- a/src/Services/Marketing/Marketing.API/Dockerfile +++ b/src/Services/Marketing/Marketing.API/Dockerfile @@ -4,16 +4,44 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/Services/Marketing/Marketing.API -RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet build --no-restore -c Release -o /app FROM build as functionaltest WORKDIR /src/src/Services/Marketing/Marketing.FunctionalTests FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index ce6ba50fa..b763f4a4d 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/src/Services/Ordering/Ordering.API/Dockerfile @@ -4,24 +4,49 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY **/*.csproj csproj-files/ -# WORKDIR /src/Dockerfile-scripts -# RUN restore-packages -# COPY . . -# WORKDIR /src/src/Services/Ordering/Ordering.API -# RUN dotnet restore -nowarn:msb3202,nu1503 -# RUN dotnet build --no-restore -c Release -o /app - -# FROM build as functionaltest -# WORKDIR /src/src/Services/Ordering/Ordering.FunctionalTests - -# FROM build as unittest -# WORKDIR /src/src/Services/Ordering/Ordering.UnitTests - -# FROM build AS publish -# RUN dotnet publish --no-restore -c Release -o /app - -# FROM base AS final -# WORKDIR /app -# COPY --from=publish /app . -# ENTRYPOINT ["dotnet", "Ordering.API.dll"] + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + +COPY . . +WORKDIR /src/src/Services/Ordering/Ordering.API +RUN dotnet build --no-restore -c Release -o /app + +FROM build as unittest +WORKDIR /src/src/Services/Ordering/Ordering.UnitTests + +FROM build as functionaltest +WORKDIR /src/src/Services/Ordering/Ordering.FunctionalTests + +FROM build AS publish + +FROM base AS final +WORKDIR /app +COPY --from=publish /app . +ENTRYPOINT ["dotnet", "Ordering.API.dll"] diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile index 94f0a88ca..f742d3d60 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile @@ -4,13 +4,41 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/Services/Ordering/Ordering.BackgroundTasks -RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile index f2634b2fe..be90a6793 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile +++ b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile @@ -4,13 +4,41 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/Services/Ordering/Ordering.SignalrHub -RUN dotnet restore -nowarn:msb3202,nu1503 -RUN dotnet build --no-restore Ordering.SignalrHub.csproj -c Release -o /app +RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish --no-restore Ordering.SignalrHub.csproj -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Services/Payment/Payment.API/Dockerfile b/src/Services/Payment/Payment.API/Dockerfile index 760a1be0a..30067579a 100644 --- a/src/Services/Payment/Payment.API/Dockerfile +++ b/src/Services/Payment/Payment.API/Dockerfile @@ -4,13 +4,41 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/Services/Payment/Payment.API -RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Services/Webhooks/Webhooks.API/Dockerfile b/src/Services/Webhooks/Webhooks.API/Dockerfile index 99a31f90b..2fb6db415 100644 --- a/src/Services/Webhooks/Webhooks.API/Dockerfile +++ b/src/Services/Webhooks/Webhooks.API/Dockerfile @@ -4,14 +4,41 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY ["src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj", "src/Services/Webhooks/Webhooks.API/"] -RUN dotnet restore "src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj" + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR "/src/src/Services/Webhooks/Webhooks.API" -RUN dotnet build "Webhooks.API.csproj" -c Release -o /app +RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish "Webhooks.API.csproj" -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index d863c9428..1eedccde3 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -4,12 +4,41 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/Web/WebMVC -RUN dotnet restore -nowarn:msb3202,nu1503 +RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile index 6ac1a7961..fa8a17607 100644 --- a/src/Web/WebSPA/Dockerfile +++ b/src/Web/WebSPA/Dockerfile @@ -3,22 +3,50 @@ FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS dotnet-build -WORKDIR /src - FROM ${NODE_IMAGE} as node-build WORKDIR /web COPY src/Web/WebSPA . RUN npm install RUN npm run build:prod -FROM dotnet-build as publish -WORKDIR /src/src/Web/WebSPA/wwwroot -COPY --from=node-build /web/wwwroot . +FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . +COPY --from=node-build /web/wwwroot /src/src/Web/WebSPA/wwwroot/ WORKDIR /src/src/Web/WebSPA -RUN dotnet publish -c Release -o /app +RUN dotnet build --no-restore -c Release -o /app + +FROM build AS publish FROM base AS final WORKDIR /app diff --git a/src/Web/WebStatus/Dockerfile b/src/Web/WebStatus/Dockerfile index d8b7c2632..e5a792f28 100644 --- a/src/Web/WebStatus/Dockerfile +++ b/src/Web/WebStatus/Dockerfile @@ -4,13 +4,41 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . WORKDIR /src/src/Web/WebStatus -RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/Web/WebhookClient/Dockerfile b/src/Web/WebhookClient/Dockerfile index a59042017..d7bf4013a 100644 --- a/src/Web/WebhookClient/Dockerfile +++ b/src/Web/WebhookClient/Dockerfile @@ -5,14 +5,41 @@ EXPOSE 443 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY ["src/Web/WebhookClient/WebhookClient.csproj", "src/Web/WebhookClient/"] -RUN dotnet restore "src/Web/WebhookClient/WebhookClient.csproj" + +COPY Dockerfile-scripts Dockerfile-scripts/ + +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ + +RUN Dockerfile-scripts/restore-packages + COPY . . -WORKDIR "/src/src/Web/WebhookClient" -RUN dotnet build "WebhookClient.csproj" -c Release -o /app +WORKDIR /src/src/Web/WebhookClient +RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN dotnet publish "WebhookClient.csproj" -c Release -o /app FROM base AS final WORKDIR /app diff --git a/src/csproj-files.txt b/src/csproj-files.txt new file mode 100644 index 000000000..6dc3532d9 --- /dev/null +++ b/src/csproj-files.txt @@ -0,0 +1,34 @@ +COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ +COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ +COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ +COPY src/BuildingBlocks/EventBus/CommandBus/*.csproj /src/src/BuildingBlocks/EventBus/CommandBus/ +COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ +COPY src/BuildingBlocks/EventBus/EventBus.Tests/*.csproj /src/src/BuildingBlocks/EventBus/EventBus.Tests/ +COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ +COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ +COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ +COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ +COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ +COPY src/Services/Basket/Basket.FunctionalTests/*.csproj /src/src/Services/Basket/Basket.FunctionalTests/ +COPY src/Services/Basket/Basket.UnitTests/*.csproj /src/src/Services/Basket/Basket.UnitTests/ +COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ +COPY src/Services/Catalog/Catalog.FunctionalTests/*.csproj /src/src/Services/Catalog/Catalog.FunctionalTests/ +COPY src/Services/Catalog/Catalog.UnitTests/*.csproj /src/src/Services/Catalog/Catalog.UnitTests/ +COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ +COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ +COPY src/Services/Location/Locations.FunctionalTests/*.csproj /src/src/Services/Location/Locations.FunctionalTests/ +COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ +COPY src/Services/Marketing/Marketing.FunctionalTests/*.csproj /src/src/Services/Marketing/Marketing.FunctionalTests/ +COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ +COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ +COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ +COPY src/Services/Ordering/Ordering.FunctionalTests/*.csproj /src/src/Services/Ordering/Ordering.FunctionalTests/ +COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ +COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ +COPY src/Services/Ordering/Ordering.UnitTests/*.csproj /src/src/Services/Ordering/Ordering.UnitTests/ +COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ +COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ +COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ +COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ +COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ +COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ From 06018d4080ce0e89a6e3a33126f967cca570b402 Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Sat, 13 Apr 2019 08:23:40 +0100 Subject: [PATCH 3/9] Streamline Dockerfiles --- Dockerfile-scripts/restore-packages | 2 +- src/ApiGateways/ApiGw-Base/Dockerfile | 31 ++++--------------- .../Mobile.Bff.Shopping/aggregator/Dockerfile | 31 ++++--------------- .../Web.Bff.Shopping/aggregator/Dockerfile | 31 ++++--------------- src/Services/Basket/Basket.API/Dockerfile | 31 ++++--------------- src/Services/Catalog/Catalog.API/Dockerfile | 31 ++++--------------- src/Services/Identity/Identity.API/Dockerfile | 31 ++++--------------- .../Location/Locations.API/Dockerfile | 31 ++++--------------- .../Marketing/Marketing.API/Dockerfile | 31 ++++--------------- src/Services/Ordering/Ordering.API/Dockerfile | 31 ++++--------------- .../Ordering.BackgroundTasks/Dockerfile | 31 ++++--------------- .../Ordering/Ordering.SignalrHub/Dockerfile | 31 ++++--------------- src/Services/Payment/Payment.API/Dockerfile | 31 ++++--------------- src/Services/Webhooks/Webhooks.API/Dockerfile | 31 ++++--------------- src/Web/WebMVC/Dockerfile | 31 ++++--------------- src/Web/WebSPA/Dockerfile | 31 ++++--------------- src/Web/WebStatus/Dockerfile | 31 ++++--------------- src/Web/WebhookClient/Dockerfile | 31 ++++--------------- 18 files changed, 103 insertions(+), 426 deletions(-) diff --git a/Dockerfile-scripts/restore-packages b/Dockerfile-scripts/restore-packages index f0a8623d2..9edc44b03 100644 --- a/Dockerfile-scripts/restore-packages +++ b/Dockerfile-scripts/restore-packages @@ -1,3 +1,3 @@ #!/bin/bash -for f in $(find /src/src -type f -name "*.csproj"); do dotnet restore $f; done +for f in /src/csproj-files/*.csproj; do dotnet restore $f; done diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile b/src/ApiGateways/ApiGw-Base/Dockerfile index 20373e2bf..7404c463c 100644 --- a/src/ApiGateways/ApiGw-Base/Dockerfile +++ b/src/ApiGateways/ApiGw-Base/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/ApiGateways/ApiGw-Base/ -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile index 1e633c2b4..abbf252a7 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile index 2a8a7af36..a816091c3 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index 41f9885d8..1126ab876 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/src/Services/Basket/Basket.API/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Services/Basket/Basket.API -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build as unittest WORKDIR /src/src/Services/Basket/Basket.UnitTests diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index 756ac0020..7542719a4 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/src/Services/Catalog/Catalog.API/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Services/Catalog/Catalog.API -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build as unittest WORKDIR /src/src/Services/Catalog/Catalog.UnitTests diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index d0ce0bc80..e31d0e6f0 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Services/Identity/Identity.API -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/Services/Location/Locations.API/Dockerfile b/src/Services/Location/Locations.API/Dockerfile index cc631de8e..4bbde3400 100644 --- a/src/Services/Location/Locations.API/Dockerfile +++ b/src/Services/Location/Locations.API/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Services/Location/Locations.API -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build as functionaltest WORKDIR /src/src/Services/Location/Locations.FunctionalTests diff --git a/src/Services/Marketing/Marketing.API/Dockerfile b/src/Services/Marketing/Marketing.API/Dockerfile index 0f061beea..e4e084690 100644 --- a/src/Services/Marketing/Marketing.API/Dockerfile +++ b/src/Services/Marketing/Marketing.API/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Services/Marketing/Marketing.API -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build as functionaltest WORKDIR /src/src/Services/Marketing/Marketing.FunctionalTests diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index b763f4a4d..7093a8f56 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/src/Services/Ordering/Ordering.API/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Services/Ordering/Ordering.API -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build as unittest WORKDIR /src/src/Services/Ordering/Ordering.UnitTests diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile index f742d3d60..a780d6589 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Services/Ordering/Ordering.BackgroundTasks -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile index be90a6793..c40b926dc 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile +++ b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Services/Ordering/Ordering.SignalrHub -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/Services/Payment/Payment.API/Dockerfile b/src/Services/Payment/Payment.API/Dockerfile index 30067579a..a3c2ec684 100644 --- a/src/Services/Payment/Payment.API/Dockerfile +++ b/src/Services/Payment/Payment.API/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Services/Payment/Payment.API -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/Services/Webhooks/Webhooks.API/Dockerfile b/src/Services/Webhooks/Webhooks.API/Dockerfile index 2fb6db415..2c078bffc 100644 --- a/src/Services/Webhooks/Webhooks.API/Dockerfile +++ b/src/Services/Webhooks/Webhooks.API/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR "/src/src/Services/Webhooks/Webhooks.API" -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index 1eedccde3..1a6374223 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Web/WebMVC -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile index fa8a17607..92626c9ba 100644 --- a/src/Web/WebSPA/Dockerfile +++ b/src/Web/WebSPA/Dockerfile @@ -14,37 +14,18 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . COPY --from=node-build /web/wwwroot /src/src/Web/WebSPA/wwwroot/ WORKDIR /src/src/Web/WebSPA -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/Web/WebStatus/Dockerfile b/src/Web/WebStatus/Dockerfile index e5a792f28..7cd6fafb6 100644 --- a/src/Web/WebStatus/Dockerfile +++ b/src/Web/WebStatus/Dockerfile @@ -7,36 +7,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Web/WebStatus -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish diff --git a/src/Web/WebhookClient/Dockerfile b/src/Web/WebhookClient/Dockerfile index d7bf4013a..ba0c223e2 100644 --- a/src/Web/WebhookClient/Dockerfile +++ b/src/Web/WebhookClient/Dockerfile @@ -8,36 +8,17 @@ WORKDIR /src COPY Dockerfile-scripts Dockerfile-scripts/ -COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/ -COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/ -COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/ -COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/ -COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/ -COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/ -COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/ -COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/ -COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/ -COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/ -COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/ -COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/ -COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/ -COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/ -COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/ -COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/ -COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/ -COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/ -COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/ -COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/ -COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/ -COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/ -COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/ -COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/ +COPY src/ApiGateways/*/*.csproj /src/csproj-files/ +COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ +COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ +COPY src/Services/*/*/*.csproj /src/csproj-files/ +COPY src/Web/*/*.csproj /src/csproj-files/ RUN Dockerfile-scripts/restore-packages COPY . . WORKDIR /src/src/Web/WebhookClient -RUN dotnet build --no-restore -c Release -o /app +RUN dotnet publish -c Release -o /app FROM build AS publish From 3ef07a580c6b8ff733462f91397a329555dc1163 Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Mon, 15 Apr 2019 19:32:12 +0100 Subject: [PATCH 4/9] Fix compilation errors and failling unit tests --- .../Basket/Basket.UnitTests/Application/BasketWebApiTest.cs | 2 -- src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj | 2 ++ src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj | 2 ++ .../Marketing.FunctionalTests/Marketing.FunctionalTests.csproj | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs b/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs index 0045ce4aa..d55dbac63 100644 --- a/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs +++ b/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs @@ -54,7 +54,6 @@ namespace UnitTest.Basket.Application var actionResult = await basketController.GetBasketByIdAsync(fakeCustomerId); //Assert - Assert.Equal((actionResult.Result as OkObjectResult).StatusCode, (int)System.Net.HttpStatusCode.OK); Assert.Equal(((CustomerBasket)actionResult.Value).BuyerId, fakeCustomerId); } @@ -80,7 +79,6 @@ namespace UnitTest.Basket.Application var actionResult = await basketController.UpdateBasketAsync(fakeCustomerBasket); //Assert - Assert.Equal((actionResult.Result as OkObjectResult).StatusCode, (int)System.Net.HttpStatusCode.OK); Assert.Equal(((CustomerBasket)actionResult.Value).BuyerId, fakeCustomerId); } diff --git a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj index bf5cb593a..27a851767 100644 --- a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj +++ b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj @@ -7,6 +7,8 @@ + + diff --git a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj index 6a9a2bf99..efa9d56a4 100644 --- a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj +++ b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj @@ -7,6 +7,8 @@ + + diff --git a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj index ae4f51ed7..14f49f53e 100644 --- a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj +++ b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj @@ -17,6 +17,8 @@ + + From 05fed22b017068092b1cbe48975c60b036f7b225 Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Mon, 15 Apr 2019 19:58:20 +0100 Subject: [PATCH 5/9] Fix failling unit tests --- .../Basket/Basket.UnitTests/Application/BasketWebApiTest.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs b/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs index d55dbac63..2864b8b9f 100644 --- a/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs +++ b/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs @@ -54,7 +54,8 @@ namespace UnitTest.Basket.Application var actionResult = await basketController.GetBasketByIdAsync(fakeCustomerId); //Assert - Assert.Equal(((CustomerBasket)actionResult.Value).BuyerId, fakeCustomerId); + Assert.Equal((actionResult.Result as OkObjectResult).StatusCode, (int)System.Net.HttpStatusCode.OK); + Assert.Equal((((ObjectResult)actionResult.Result).Value as CustomerBasket).BuyerId, fakeCustomerId); } [Fact] @@ -79,7 +80,8 @@ namespace UnitTest.Basket.Application var actionResult = await basketController.UpdateBasketAsync(fakeCustomerBasket); //Assert - Assert.Equal(((CustomerBasket)actionResult.Value).BuyerId, fakeCustomerId); + Assert.Equal((actionResult.Result as OkObjectResult).StatusCode, (int)System.Net.HttpStatusCode.OK); + Assert.Equal((((ObjectResult)actionResult.Result).Value as CustomerBasket).BuyerId, fakeCustomerId); } [Fact] From e42712bb693ca045d30a488725eb8e59d0edb1dd Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Mon, 15 Apr 2019 20:30:59 +0100 Subject: [PATCH 6/9] Fix failling functional tests --- .../Marketing.FunctionalTests/Marketing.FunctionalTests.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj index 14f49f53e..eaedddbd5 100644 --- a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj +++ b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj @@ -19,7 +19,7 @@ - + @@ -30,7 +30,6 @@ - From f56f04dcb908404381916b4598212234a9995de3 Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Mon, 15 Apr 2019 20:34:22 +0100 Subject: [PATCH 7/9] gitignore tests-results folder --- .gitignore | 2 + tests-results/basket-test-results.xml | 65 -------------- tests-results/basket-unit-test-results.xml | 65 -------------- tests-results/catalog-test-results.xml | 89 -------------------- tests-results/catalog-unit-test-results.xml | 89 -------------------- tests-results/locations-test-results.xml | 47 ----------- tests-results/marketing-test-results.xml | 77 ----------------- tests-results/ordering-test-results.xml | 41 --------- tests-results/ordering-unit-test-results.xml | 41 --------- 9 files changed, 2 insertions(+), 514 deletions(-) delete mode 100644 tests-results/basket-test-results.xml delete mode 100644 tests-results/basket-unit-test-results.xml delete mode 100644 tests-results/catalog-test-results.xml delete mode 100644 tests-results/catalog-unit-test-results.xml delete mode 100644 tests-results/locations-test-results.xml delete mode 100644 tests-results/marketing-test-results.xml delete mode 100644 tests-results/ordering-test-results.xml delete mode 100644 tests-results/ordering-unit-test-results.xml diff --git a/.gitignore b/.gitignore index b10401dd4..f3fdf2b8f 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,8 @@ src/Web/WebMVC/wwwroot/js/site* *.VisualState.xml TestResult.xml +tests-results/ + # Build Results of an ATL Project [Dd]ebugPS/ [Rr]eleasePS/ diff --git a/tests-results/basket-test-results.xml b/tests-results/basket-test-results.xml deleted file mode 100644 index 933ed1b5b..000000000 --- a/tests-results/basket-test-results.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [xUnit.net 00:00:06.1434181] Discovering: Basket.UnitTests[xUnit.net 00:00:06.4201662] Discovered: Basket.UnitTests[xUnit.net 00:00:06.4258049] Starting: Basket.UnitTests[xUnit.net 00:00:09.1721258] Finished: Basket.UnitTests - - - \ No newline at end of file diff --git a/tests-results/basket-unit-test-results.xml b/tests-results/basket-unit-test-results.xml deleted file mode 100644 index c7a6cd004..000000000 --- a/tests-results/basket-unit-test-results.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [xUnit.net 00:00:06.7811016] Discovering: Basket.UnitTests[xUnit.net 00:00:07.1809374] Discovered: Basket.UnitTests[xUnit.net 00:00:07.1870723] Starting: Basket.UnitTests[xUnit.net 00:00:10.4183620] Finished: Basket.UnitTests - - - \ No newline at end of file diff --git a/tests-results/catalog-test-results.xml b/tests-results/catalog-test-results.xml deleted file mode 100644 index 73efaeb8f..000000000 --- a/tests-results/catalog-test-results.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [xUnit.net 00:00:06.0723374] Discovering: Catalog.FunctionalTests[xUnit.net 00:00:06.4361995] Discovered: Catalog.FunctionalTests[xUnit.net 00:00:06.4447894] Starting: Catalog.FunctionalTests[xUnit.net 00:00:34.5834045] Finished: Catalog.FunctionalTests - - - \ No newline at end of file diff --git a/tests-results/catalog-unit-test-results.xml b/tests-results/catalog-unit-test-results.xml deleted file mode 100644 index 2bc65d5c9..000000000 --- a/tests-results/catalog-unit-test-results.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [xUnit.net 00:00:06.6354381] Discovering: Catalog.FunctionalTests[xUnit.net 00:00:07.0010904] Discovered: Catalog.FunctionalTests[xUnit.net 00:00:07.0749761] Starting: Catalog.FunctionalTests[xUnit.net 00:00:34.9063753] Finished: Catalog.FunctionalTests - - - \ No newline at end of file diff --git a/tests-results/locations-test-results.xml b/tests-results/locations-test-results.xml deleted file mode 100644 index c8b5e6b82..000000000 --- a/tests-results/locations-test-results.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [xUnit.net 00:00:07.7665792] Discovering: Locations.FunctionalTests[xUnit.net 00:00:08.1972548] Discovered: Locations.FunctionalTests[xUnit.net 00:00:08.2137816] Starting: Locations.FunctionalTests[xUnit.net 00:00:27.6429580] Finished: Locations.FunctionalTests - - - \ No newline at end of file diff --git a/tests-results/marketing-test-results.xml b/tests-results/marketing-test-results.xml deleted file mode 100644 index 5545febcc..000000000 --- a/tests-results/marketing-test-results.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [xUnit.net 00:00:01.0963036] Discovering: Marketing.FunctionalTests[xUnit.net 00:00:01.1452772] Discovered: Marketing.FunctionalTests[xUnit.net 00:00:01.1494340] Starting: Marketing.FunctionalTests[xUnit.net 00:00:06.9663675] Finished: Marketing.FunctionalTests - - - \ No newline at end of file diff --git a/tests-results/ordering-test-results.xml b/tests-results/ordering-test-results.xml deleted file mode 100644 index 231975d56..000000000 --- a/tests-results/ordering-test-results.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [xUnit.net 00:00:05.2039980] Discovering: Ordering.FunctionalTests[xUnit.net 00:00:05.4802527] Discovered: Ordering.FunctionalTests[xUnit.net 00:00:05.5249888] Starting: Ordering.FunctionalTests[xUnit.net 00:00:20.1396674] Finished: Ordering.FunctionalTests - - - \ No newline at end of file diff --git a/tests-results/ordering-unit-test-results.xml b/tests-results/ordering-unit-test-results.xml deleted file mode 100644 index c9f85a60f..000000000 --- a/tests-results/ordering-unit-test-results.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [xUnit.net 00:00:05.4257955] Discovering: Ordering.FunctionalTests[xUnit.net 00:00:05.9560169] Discovered: Ordering.FunctionalTests[xUnit.net 00:00:05.9845906] Starting: Ordering.FunctionalTests[xUnit.net 00:00:21.2769127] Finished: Ordering.FunctionalTests - - - \ No newline at end of file From 914e8bd0cdd269b74a984e6cb1fd04584d1bee4f Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Mon, 22 Apr 2019 18:10:53 +0100 Subject: [PATCH 8/9] Make the RUN restore-packages optional through an option on docker-compose --- {Dockerfile-scripts => scripts}/restore-packages | 0 src/ApiGateways/ApiGw-Base/Dockerfile | 5 +++-- src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile | 5 +++-- src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile | 5 +++-- src/Services/Basket/Basket.API/Dockerfile | 5 +++-- src/Services/Catalog/Catalog.API/Dockerfile | 5 +++-- src/Services/Identity/Identity.API/Dockerfile | 5 +++-- src/Services/Location/Locations.API/Dockerfile | 5 +++-- src/Services/Marketing/Marketing.API/Dockerfile | 5 +++-- src/Services/Ordering/Ordering.API/Dockerfile | 5 +++-- src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile | 5 +++-- src/Services/Ordering/Ordering.SignalrHub/Dockerfile | 5 +++-- src/Services/Payment/Payment.API/Dockerfile | 5 +++-- src/Services/Webhooks/Webhooks.API/Dockerfile | 5 +++-- src/Web/WebMVC/Dockerfile | 5 +++-- src/Web/WebSPA/Dockerfile | 5 +++-- src/Web/WebStatus/Dockerfile | 5 +++-- src/Web/WebhookClient/Dockerfile | 5 +++-- 18 files changed, 51 insertions(+), 34 deletions(-) rename {Dockerfile-scripts => scripts}/restore-packages (100%) diff --git a/Dockerfile-scripts/restore-packages b/scripts/restore-packages similarity index 100% rename from Dockerfile-scripts/restore-packages rename to scripts/restore-packages diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile b/src/ApiGateways/ApiGw-Base/Dockerfile index 7404c463c..f4751f2d1 100644 --- a/src/ApiGateways/ApiGw-Base/Dockerfile +++ b/src/ApiGateways/ApiGw-Base/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/ApiGateways/ApiGw-Base/ diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile index abbf252a7..d29c73b3e 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile index a816091c3..8ac850778 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index 1126ab876..81955e178 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/src/Services/Basket/Basket.API/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Services/Basket/Basket.API diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index 7542719a4..70a97da27 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/src/Services/Catalog/Catalog.API/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Services/Catalog/Catalog.API diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index e31d0e6f0..ed1502208 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Services/Identity/Identity.API diff --git a/src/Services/Location/Locations.API/Dockerfile b/src/Services/Location/Locations.API/Dockerfile index 4bbde3400..5f5a0c88a 100644 --- a/src/Services/Location/Locations.API/Dockerfile +++ b/src/Services/Location/Locations.API/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Services/Location/Locations.API diff --git a/src/Services/Marketing/Marketing.API/Dockerfile b/src/Services/Marketing/Marketing.API/Dockerfile index e4e084690..bd9e3807b 100644 --- a/src/Services/Marketing/Marketing.API/Dockerfile +++ b/src/Services/Marketing/Marketing.API/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Services/Marketing/Marketing.API diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index 7093a8f56..aa1f0e9c6 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/src/Services/Ordering/Ordering.API/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Services/Ordering/Ordering.API diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile index a780d6589..0c121f4a8 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Services/Ordering/Ordering.BackgroundTasks diff --git a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile index c40b926dc..a40dc797f 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile +++ b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Services/Ordering/Ordering.SignalrHub diff --git a/src/Services/Payment/Payment.API/Dockerfile b/src/Services/Payment/Payment.API/Dockerfile index a3c2ec684..dcaf9b5e8 100644 --- a/src/Services/Payment/Payment.API/Dockerfile +++ b/src/Services/Payment/Payment.API/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Services/Payment/Payment.API diff --git a/src/Services/Webhooks/Webhooks.API/Dockerfile b/src/Services/Webhooks/Webhooks.API/Dockerfile index 2c078bffc..0da59affa 100644 --- a/src/Services/Webhooks/Webhooks.API/Dockerfile +++ b/src/Services/Webhooks/Webhooks.API/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR "/src/src/Services/Webhooks/Webhooks.API" diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index 1a6374223..4cb62e614 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Web/WebMVC diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile index 92626c9ba..ef0f46c7f 100644 --- a/src/Web/WebSPA/Dockerfile +++ b/src/Web/WebSPA/Dockerfile @@ -12,7 +12,7 @@ RUN npm run build:prod FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -20,7 +20,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . COPY --from=node-build /web/wwwroot /src/src/Web/WebSPA/wwwroot/ diff --git a/src/Web/WebStatus/Dockerfile b/src/Web/WebStatus/Dockerfile index 7cd6fafb6..edb691988 100644 --- a/src/Web/WebStatus/Dockerfile +++ b/src/Web/WebStatus/Dockerfile @@ -5,7 +5,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -13,7 +13,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Web/WebStatus diff --git a/src/Web/WebhookClient/Dockerfile b/src/Web/WebhookClient/Dockerfile index ba0c223e2..0710db058 100644 --- a/src/Web/WebhookClient/Dockerfile +++ b/src/Web/WebhookClient/Dockerfile @@ -6,7 +6,7 @@ EXPOSE 443 FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build WORKDIR /src -COPY Dockerfile-scripts Dockerfile-scripts/ +COPY scripts scripts/ COPY src/ApiGateways/*/*.csproj /src/csproj-files/ COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/ @@ -14,7 +14,8 @@ COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/ COPY src/Services/*/*/*.csproj /src/csproj-files/ COPY src/Web/*/*.csproj /src/csproj-files/ -RUN Dockerfile-scripts/restore-packages +ARG RUN=pwd +RUN ${RUN} COPY . . WORKDIR /src/src/Web/WebhookClient From df72a039c5686be1c518f38a50ba1fceb3e5584f Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Tue, 23 Apr 2019 12:48:56 +0100 Subject: [PATCH 9/9] Remove failling Windows BuildJob (seems to be related to the base image) --- build/azure-devops/apigws/azure-pipelines.yml | 28 ------------------- scripts/restore-packages.cmd | 1 + 2 files changed, 1 insertion(+), 28 deletions(-) create mode 100644 scripts/restore-packages.cmd diff --git a/build/azure-devops/apigws/azure-pipelines.yml b/build/azure-devops/apigws/azure-pipelines.yml index adf00e4d0..6fedf33a6 100644 --- a/build/azure-devops/apigws/azure-pipelines.yml +++ b/build/azure-devops/apigws/azure-pipelines.yml @@ -50,31 +50,3 @@ jobs: inputs: pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm artifactName: helm -- job: BuildWindows - pool: - vmImage: 'vs2017-win2016' - steps: - - task: DockerCompose@0 - displayName: Compose build apigws - inputs: - dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw' - containerregistrytype: Container Registry - dockerRegistryEndpoint: $(registryEndpoint) - dockerComposeFile: docker-compose.yml - qualifyImageNames: true - projectName: "" - dockerComposeFileArgs: | - TAG=$(Build.SourceBranchName) - PLATFORM=win - - task: DockerCompose@0 - displayName: Compose push apigws - inputs: - dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw' - containerregistrytype: Container Registry - dockerRegistryEndpoint: $(registryEndpoint) - dockerComposeFile: docker-compose.yml - qualifyImageNames: true - projectName: "" - dockerComposeFileArgs: | - TAG=$(Build.SourceBranchName) - PLATFORM=win \ No newline at end of file diff --git a/scripts/restore-packages.cmd b/scripts/restore-packages.cmd new file mode 100644 index 000000000..9f3a8434e --- /dev/null +++ b/scripts/restore-packages.cmd @@ -0,0 +1 @@ +for %%p in (csproj-files\*.csproj) do dotnet restore %%p