Browse Source

Make the RUN restore-packages optional through an option on docker-compose

pull/1005/head
Miguel Veloso 5 years ago
parent
commit
914e8bd0cd
18 changed files with 51 additions and 34 deletions
  1. +0
    -0
      scripts/restore-packages
  2. +3
    -2
      src/ApiGateways/ApiGw-Base/Dockerfile
  3. +3
    -2
      src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
  4. +3
    -2
      src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
  5. +3
    -2
      src/Services/Basket/Basket.API/Dockerfile
  6. +3
    -2
      src/Services/Catalog/Catalog.API/Dockerfile
  7. +3
    -2
      src/Services/Identity/Identity.API/Dockerfile
  8. +3
    -2
      src/Services/Location/Locations.API/Dockerfile
  9. +3
    -2
      src/Services/Marketing/Marketing.API/Dockerfile
  10. +3
    -2
      src/Services/Ordering/Ordering.API/Dockerfile
  11. +3
    -2
      src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
  12. +3
    -2
      src/Services/Ordering/Ordering.SignalrHub/Dockerfile
  13. +3
    -2
      src/Services/Payment/Payment.API/Dockerfile
  14. +3
    -2
      src/Services/Webhooks/Webhooks.API/Dockerfile
  15. +3
    -2
      src/Web/WebMVC/Dockerfile
  16. +3
    -2
      src/Web/WebSPA/Dockerfile
  17. +3
    -2
      src/Web/WebStatus/Dockerfile
  18. +3
    -2
      src/Web/WebhookClient/Dockerfile

Dockerfile-scripts/restore-packages → scripts/restore-packages View File


+ 3
- 2
src/ApiGateways/ApiGw-Base/Dockerfile View File

@ -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/


+ 3
- 2
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile View File

@ -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


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

@ -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


+ 3
- 2
src/Services/Basket/Basket.API/Dockerfile View File

@ -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


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

@ -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


+ 3
- 2
src/Services/Identity/Identity.API/Dockerfile View File

@ -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


+ 3
- 2
src/Services/Location/Locations.API/Dockerfile View File

@ -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


+ 3
- 2
src/Services/Marketing/Marketing.API/Dockerfile View File

@ -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


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

@ -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


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

@ -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


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

@ -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


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

@ -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


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

@ -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"


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

@ -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


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

@ -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/


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

@ -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


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

@ -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


Loading…
Cancel
Save