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

mvelosop · mvelosop · commit 914e8bd0cdd2 · 2019-04-22T18:10:53.000+01:00
diff --git a/scripts/restore-packages b/scripts/restore-packages
diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile b/src/ApiGateways/ApiGw-Base/Dockerfile
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -12,15 +12,16 @@ 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/
 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
@@ -5,15 +5,16 @@ 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/
 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
@@ -6,15 +6,16 @@ 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/
 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
