Update Dockerfiles for use /src as build context root

global.json

@@ -1 +0,0 @@
-{}

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile

@@ -7,14 +7,14 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator
+WORKDIR /src/ApiGateways/Mobile.Bff.Shopping/aggregator
 RUN dotnet publish -c Release -o /app
 
 FROM build AS publish

src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile

@@ -7,14 +7,14 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator
+WORKDIR /src/ApiGateways/Web.Bff.Shopping/aggregator
 RUN dotnet publish -c Release -o /app
 
 FROM build AS publish

src/Services/Basket/Basket.API/Dockerfile

@@ -7,21 +7,21 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/Services/Basket/Basket.API
+WORKDIR /src/Services/Basket/Basket.API
 RUN dotnet publish -c Release -o /app
 
 FROM build as unittest
-WORKDIR /src/src/Services/Basket/Basket.UnitTests
+WORKDIR /src/Services/Basket/Basket.UnitTests
 
 FROM build as functionaltest
-WORKDIR /src/src/Services/Basket/Basket.FunctionalTests
+WORKDIR /src/Services/Basket/Basket.FunctionalTests
 
 FROM build AS publish
 

src/Services/Basket/Basket.API/Dockerfile.develop

@@ -6,14 +6,14 @@ EXPOSE 80
 
 WORKDIR /src
 
-COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
-COPY ["src/Services/Basket/Basket.API/Basket.API.csproj", "src/Services/Basket/Basket.API/"]
+COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
+COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
+COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
+COPY ["Services/Basket/Basket.API/Basket.API.csproj", "Services/Basket/Basket.API/"]
 
-RUN dotnet restore src/Services/Basket/Basket.API/Basket.API.csproj -nowarn:msb3202,nu1503
+RUN dotnet restore Services/Basket/Basket.API/Basket.API.csproj -nowarn:msb3202,nu1503
 COPY . .
-WORKDIR /src/src/Services/Basket/Basket.API
+WORKDIR /src/Services/Basket/Basket.API
 RUN dotnet build --no-restore -c $BUILD_CONFIGURATION
 
 ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

src/Services/Catalog/Catalog.API/Dockerfile

@@ -8,27 +8,27 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/Services/Catalog/Catalog.API
+WORKDIR /src/Services/Catalog/Catalog.API
 RUN dotnet publish -c Release -o /app
 
 FROM build as unittest
-WORKDIR /src/src/Services/Catalog/Catalog.UnitTests
+WORKDIR /src/Services/Catalog/Catalog.UnitTests
 
 FROM build as functionaltest
-WORKDIR /src/src/Services/Catalog/Catalog.FunctionalTests
+WORKDIR /src/Services/Catalog/Catalog.FunctionalTests
 
 FROM build AS publish
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app .
-COPY --from=build /src/src/Services/Catalog/Catalog.API/Proto /app/Proto
-COPY --from=build /src/src/Services/Catalog/Catalog.API/eshop.pfx .
+COPY --from=build /src/Services/Catalog/Catalog.API/Proto /app/Proto
+COPY --from=build /src/Services/Catalog/Catalog.API/eshop.pfx .
 ENTRYPOINT ["dotnet", "Catalog.API.dll"]

src/Services/Catalog/Catalog.API/Dockerfile.develop

@@ -6,16 +6,16 @@ EXPOSE 80
 
 WORKDIR /src
 
-COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
-COPY ["src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "src/BuildingBlocks/EventBus/IntegrationEventLogEF/"]
-COPY ["src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "src/BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
-COPY ["src/Services/Catalog/Catalog.API/Catalog.API.csproj", "src/Services/Catalog/Catalog.API/"]
+COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
+COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
+COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
+COPY ["BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "BuildingBlocks/EventBus/IntegrationEventLogEF/"]
+COPY ["BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
+COPY ["Services/Catalog/Catalog.API/Catalog.API.csproj", "Services/Catalog/Catalog.API/"]
 
-RUN dotnet restore src/Services/Catalog/Catalog.API/Catalog.API.csproj -nowarn:msb3202,nu1503
+RUN dotnet restore Services/Catalog/Catalog.API/Catalog.API.csproj -nowarn:msb3202,nu1503
 COPY . .
-WORKDIR "/src/src/Services/Catalog/Catalog.API"
+WORKDIR "/src/Services/Catalog/Catalog.API"
 RUN dotnet build  --no-restore -c $BUILD_CONFIGURATION
 
 ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

src/Services/Identity/Identity.API/Dockerfile

@@ -7,14 +7,14 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/Services/Identity/Identity.API
+WORKDIR /src/Services/Identity/Identity.API
 RUN dotnet publish -c Release -o /app
 
 FROM build AS publish

src/Services/Identity/Identity.API/Dockerfile.develop

@@ -5,11 +5,11 @@ ENV DOTNET_USE_POLLING_FILE_WATCHER=true
 EXPOSE 80
 
 WORKDIR /src
-COPY ["src/Services/Identity/Identity.API/Identity.API.csproj", "src/Services/Identity/Identity.API/"]
-COPY ["src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "src/BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
-RUN dotnet restore src/Services/Identity/Identity.API/Identity.API.csproj -nowarn:msb3202,nu1503
+COPY ["Services/Identity/Identity.API/Identity.API.csproj", "Services/Identity/Identity.API/"]
+COPY ["BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
+RUN dotnet restore Services/Identity/Identity.API/Identity.API.csproj -nowarn:msb3202,nu1503
 COPY . .
-WORKDIR "/src/src/Services/Identity/Identity.API"
+WORKDIR "/src/Services/Identity/Identity.API"
 RUN dotnet build  --no-restore -c $BUILD_CONFIGURATION
 
 ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

src/Services/Location/Locations.API/Dockerfile

@@ -7,18 +7,18 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/Services/Location/Locations.API
+WORKDIR /src/Services/Location/Locations.API
 RUN dotnet publish -c Release -o /app
 
 FROM build as functionaltest
-WORKDIR /src/src/Services/Location/Locations.FunctionalTests
+WORKDIR /src/Services/Location/Locations.FunctionalTests
 
 FROM build AS publish
 

src/Services/Location/Locations.API/Dockerfile.develop

@@ -5,13 +5,13 @@ ENV DOTNET_USE_POLLING_FILE_WATCHER=true
 EXPOSE 80
 
 WORKDIR /src
-COPY ["src/Services/Location/Locations.API/Locations.API.csproj", "src/Services/Location/Locations.API/"]
-COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
-RUN dotnet restore src/Services/Location/Locations.API/Locations.API.csproj -nowarn:msb3202,nu1503
+COPY ["Services/Location/Locations.API/Locations.API.csproj", "Services/Location/Locations.API/"]
+COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
+COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
+COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
+RUN dotnet restore Services/Location/Locations.API/Locations.API.csproj -nowarn:msb3202,nu1503
 COPY . .
-WORKDIR "/src/src/Services/Location/Locations.API"
+WORKDIR "/src/Services/Location/Locations.API"
 RUN dotnet build  --no-restore -c $BUILD_CONFIGURATION
 
 ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

src/Services/Marketing/Marketing.API/Dockerfile

@@ -7,18 +7,18 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/Services/Marketing/Marketing.API
+WORKDIR /src/Services/Marketing/Marketing.API
 RUN dotnet publish -c Release -o /app
 
 FROM build as functionaltest
-WORKDIR /src/src/Services/Marketing/Marketing.FunctionalTests
+WORKDIR /src/Services/Marketing/Marketing.FunctionalTests
 
 FROM build AS publish
 

src/Services/Marketing/Marketing.API/Dockerfile.develop

@@ -5,14 +5,14 @@ ENV DOTNET_USE_POLLING_FILE_WATCHER=true
 EXPOSE 80
 
 WORKDIR /src
-COPY ["src/Services/Marketing/Marketing.API/Marketing.API.csproj", "src/Services/Marketing/Marketing.API/"]
-COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
-COPY ["src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "src/BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
-RUN dotnet restore src/Services/Marketing/Marketing.API/Marketing.API.csproj -nowarn:msb3202,nu1503
+COPY [Services/Marketing/Marketing.API/Marketing.API.csproj", "Services/Marketing/Marketing.API/"]
+COPY [BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
+COPY [BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
+COPY [BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
+COPY [BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
+RUN dotnet restore Services/Marketing/Marketing.API/Marketing.API.csproj -nowarn:msb3202,nu1503
 COPY . .
-WORKDIR "/src/src/Services/Marketing/Marketing.API"
+WORKDIR "/src/Services/Marketing/Marketing.API"
 RUN dotnet build  --no-restore -c $BUILD_CONFIGURATION
 
 ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

src/Services/Ordering/Ordering.API/Dockerfile

@@ -7,21 +7,21 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/Services/Ordering/Ordering.API
+WORKDIR /src/Services/Ordering/Ordering.API
 RUN dotnet publish -c Release -o /app
 
 FROM build as unittest
-WORKDIR /src/src/Services/Ordering/Ordering.UnitTests
+WORKDIR /src/Services/Ordering/Ordering.UnitTests
 
 FROM build as functionaltest
-WORKDIR /src/src/Services/Ordering/Ordering.FunctionalTests
+WORKDIR /src/Services/Ordering/Ordering.FunctionalTests
 
 FROM build AS publish
 

src/Services/Ordering/Ordering.API/Dockerfile.develop

@@ -5,18 +5,18 @@ ENV DOTNET_USE_POLLING_FILE_WATCHER=true
 EXPOSE 80
 
 WORKDIR /src
-COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
-COPY ["src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "src/BuildingBlocks/EventBus/IntegrationEventLogEF/"]
-COPY ["src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "src/BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
-COPY ["src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj", "src/Services/Ordering/Ordering.Domain/"]
-COPY ["src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj", "src/Services/Ordering/Ordering.Infrastructure/"]
-COPY ["src/Services/Ordering/Ordering.API/Ordering.API.csproj", "src/Services/Ordering/Ordering.API/"]
+COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
+COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
+COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
+COPY ["BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "BuildingBlocks/EventBus/IntegrationEventLogEF/"]
+COPY ["BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
+COPY ["Services/Ordering/Ordering.Domain/Ordering.Domain.csproj", "Services/Ordering/Ordering.Domain/"]
+COPY ["Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj", "Services/Ordering/Ordering.Infrastructure/"]
+COPY ["Services/Ordering/Ordering.API/Ordering.API.csproj", "Services/Ordering/Ordering.API/"]
 
-RUN dotnet restore src/Services/Ordering/Ordering.API/Ordering.API.csproj
+RUN dotnet restore Services/Ordering/Ordering.API/Ordering.API.csproj
 COPY . .
-WORKDIR /src/src/Services/Ordering/Ordering.API
+WORKDIR /src/Services/Ordering/Ordering.API
 RUN dotnet build --no-restore -c $BUILD_CONFIGURATION
 
 ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

src/Services/Payment/Payment.API/Dockerfile

@@ -7,14 +7,14 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/Services/Payment/Payment.API
+WORKDIR /src/Services/Payment/Payment.API
 RUN dotnet publish -c Release -o /app
 
 FROM build AS publish

src/Services/Payment/Payment.API/Dockerfile.develop

@@ -5,15 +5,15 @@ ENV DOTNET_USE_POLLING_FILE_WATCHER=true
 EXPOSE 80
 
 WORKDIR /src
-COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
-COPY ["src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "src/BuildingBlocks/EventBus/IntegrationEventLogEF/"]
-COPY ["src/Services/Payment/Payment.API/Payment.API.csproj", "src/Services/Payment/Payment.API/"]
+COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
+COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
+COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
+COPY ["BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "BuildingBlocks/EventBus/IntegrationEventLogEF/"]
+COPY ["Services/Payment/Payment.API/Payment.API.csproj", "Services/Payment/Payment.API/"]
 
-RUN dotnet restore src/Services/Payment/Payment.API/Payment.API.csproj
+RUN dotnet restore Services/Payment/Payment.API/Payment.API.csproj
 COPY . .
-WORKDIR /src/src/Services/Payment/Payment.API
+WORKDIR /src/Services/Payment/Payment.API
 RUN dotnet build --no-restore -c $BUILD_CONFIGURATION
 
 ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

src/Services/Webhooks/Webhooks.API/Dockerfile

@@ -7,14 +7,14 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR "/src/src/Services/Webhooks/Webhooks.API"
+WORKDIR /src/Services/Webhooks/Webhooks.API
 RUN dotnet publish -c Release -o /app
 
 FROM build AS publish

src/Services/Webhooks/Webhooks.API/Dockerfile.develop

@@ -6,17 +6,17 @@ EXPOSE 80
 
 WORKDIR /src
 
-COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
-COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
-COPY ["src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "src/BuildingBlocks/EventBus/IntegrationEventLogEF/"]
-COPY ["src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "src/BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
-COPY ["src/BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj", "src/BuildingBlocks/Devspaces.Support/"]
-COPY ["src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj", "src/Services/Webhooks/Webhooks.API/"]
+COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
+COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
+COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
+COPY ["BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "BuildingBlocks/EventBus/IntegrationEventLogEF/"]
+COPY ["BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
+COPY ["BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj", "BuildingBlocks/Devspaces.Support/"]
+COPY ["Services/Webhooks/Webhooks.API/Webhooks.API.csproj", "Services/Webhooks/Webhooks.API/"]
 
-RUN dotnet restore src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj -nowarn:msb3202,nu1503
+RUN dotnet restore Services/Webhooks/Webhooks.API/Webhooks.API.csproj -nowarn:msb3202,nu1503
 COPY . .
-WORKDIR "/src/src/Services/Webhooks/Webhooks.API"
+WORKDIR "/src/Services/Webhooks/Webhooks.API"
 RUN dotnet build  --no-restore -c $BUILD_CONFIGURATION
 
 ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

src/Web/WebMVC/Dockerfile

@@ -7,14 +7,14 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/Web/WebMVC
+WORKDIR /src/Web/WebMVC
 RUN dotnet publish -c Release -o /app
 
 FROM build AS publish

src/Web/WebMVC/Dockerfile.develop

@@ -5,11 +5,11 @@ ENV DOTNET_USE_POLLING_FILE_WATCHER=true
 EXPOSE 80
 
 WORKDIR /src
-COPY ["src/Web/WebMVC/WebMVC.csproj", "src/Web/WebMVC/"]
-COPY ["src/BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj", "src/BuildingBlocks/Devspaces.Support/"]
-RUN dotnet restore "src/Web/WebMVC/WebMVC.csproj"
+COPY ["Web/WebMVC/WebMVC.csproj", "Web/WebMVC/"]
+COPY ["BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj", "BuildingBlocks/Devspaces.Support/"]
+RUN dotnet restore "Web/WebMVC/WebMVC.csproj"
 COPY . .
-WORKDIR "/src/src/Web/WebMVC"
+WORKDIR "/src/Web/WebMVC"
 RUN dotnet build --no-restore "WebMVC.csproj" -c $BUILD_CONFIGURATION
 
 ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

src/Web/WebSPA/Dockerfile

@@ -5,7 +5,7 @@ EXPOSE 80
 
 FROM ${NODE_IMAGE} as node-build
 WORKDIR /web
-COPY src/Web/WebSPA .
+COPY Web/WebSPA .
 RUN npm install
 RUN npm run build:prod
 
@@ -14,15 +14,15 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-COPY --from=node-build /web/wwwroot /src/src/Web/WebSPA/wwwroot/
-WORKDIR /src/src/Web/WebSPA
+COPY --from=node-build /web/wwwroot /src/Web/WebSPA/wwwroot/
+WORKDIR /src/Web/WebSPA
 RUN dotnet publish -c Release -o /app
 
 FROM build AS publish

src/Web/WebStatus/Dockerfile

@@ -7,14 +7,14 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/Web/WebStatus
+WORKDIR /src/Web/WebStatus
 RUN dotnet publish -c Release -o /app
 
 FROM build AS publish

src/Web/WebhookClient/Dockerfile

@@ -8,14 +8,14 @@ WORKDIR /src
 
 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/
+COPY ApiGateways/*/*.csproj csproj-files/
+COPY ApiGateways/*/*/*.csproj csproj-files/
+COPY BuildingBlocks/*/*/*.csproj csproj-files/
+COPY Services/*/*/*.csproj csproj-files/
+COPY Web/*/*.csproj csproj-files/
 
 COPY . .
-WORKDIR /src/src/Web/WebhookClient
+WORKDIR /src/Web/WebhookClient
 RUN dotnet publish -c Release -o /app
 
 FROM build AS publish