Skip to content

Commit e18c74f

Browse files
author
ericuss
committed
Merge branch 'features/grpc' of https://github.com/dotnet-architecture/eShopOnContainers into features/grpc
2 parents 63e20bb + 8703638 commit e18c74f

44 files changed

Lines changed: 238 additions & 239 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎global.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

.dockerignore renamed to src/.dockerignore

File renamed without changes.

.env renamed to src/.env

File renamed without changes.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ WORKDIR /src
77

88
COPY scripts scripts/
99

10-
COPY src/ApiGateways/*/*.csproj /src/csproj-files/
11-
COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
12-
COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
13-
COPY src/Services/*/*/*.csproj /src/csproj-files/
14-
COPY src/Web/*/*.csproj /src/csproj-files/
10+
COPY ApiGateways/*/*.csproj csproj-files/
11+
COPY ApiGateways/*/*/*.csproj csproj-files/
12+
COPY BuildingBlocks/*/*/*.csproj csproj-files/
13+
COPY Services/*/*/*.csproj csproj-files/
14+
COPY Web/*/*.csproj csproj-files/
1515

1616
COPY . .
17-
WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator
17+
WORKDIR /src/ApiGateways/Mobile.Bff.Shopping/aggregator
1818
RUN dotnet publish -c Release -o /app
1919

2020
FROM build AS publish

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ WORKDIR /src
77

88
COPY scripts scripts/
99

10-
COPY src/ApiGateways/*/*.csproj /src/csproj-files/
11-
COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
12-
COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
13-
COPY src/Services/*/*/*.csproj /src/csproj-files/
14-
COPY src/Web/*/*.csproj /src/csproj-files/
10+
COPY ApiGateways/*/*.csproj csproj-files/
11+
COPY ApiGateways/*/*/*.csproj csproj-files/
12+
COPY BuildingBlocks/*/*/*.csproj csproj-files/
13+
COPY Services/*/*/*.csproj csproj-files/
14+
COPY Web/*/*.csproj csproj-files/
1515

1616
COPY . .
17-
WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator
17+
WORKDIR /src/ApiGateways/Web.Bff.Shopping/aggregator
1818
RUN dotnet publish -c Release -o /app
1919

2020
FROM build AS publish

NuGet.config renamed to src/NuGet.config

File renamed without changes.

‎src/Services/Basket/Basket.API/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ WORKDIR /src
77

88
COPY scripts scripts/
99

10-
COPY src/ApiGateways/*/*.csproj /src/csproj-files/
11-
COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
12-
COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
13-
COPY src/Services/*/*/*.csproj /src/csproj-files/
14-
COPY src/Web/*/*.csproj /src/csproj-files/
10+
COPY ApiGateways/*/*.csproj csproj-files/
11+
COPY ApiGateways/*/*/*.csproj csproj-files/
12+
COPY BuildingBlocks/*/*/*.csproj csproj-files/
13+
COPY Services/*/*/*.csproj csproj-files/
14+
COPY Web/*/*.csproj csproj-files/
1515

1616
COPY . .
17-
WORKDIR /src/src/Services/Basket/Basket.API
17+
WORKDIR /src/Services/Basket/Basket.API
1818
RUN dotnet publish -c Release -o /app
1919

2020
FROM build as unittest
21-
WORKDIR /src/src/Services/Basket/Basket.UnitTests
21+
WORKDIR /src/Services/Basket/Basket.UnitTests
2222

2323
FROM build as functionaltest
24-
WORKDIR /src/src/Services/Basket/Basket.FunctionalTests
24+
WORKDIR /src/Services/Basket/Basket.FunctionalTests
2525

2626
FROM build AS publish
2727

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ EXPOSE 80
66

77
WORKDIR /src
88

9-
COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
10-
COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
11-
COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
12-
COPY ["src/Services/Basket/Basket.API/Basket.API.csproj", "src/Services/Basket/Basket.API/"]
9+
COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
10+
COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
11+
COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
12+
COPY ["Services/Basket/Basket.API/Basket.API.csproj", "Services/Basket/Basket.API/"]
1313

14-
RUN dotnet restore src/Services/Basket/Basket.API/Basket.API.csproj -nowarn:msb3202,nu1503
14+
RUN dotnet restore Services/Basket/Basket.API/Basket.API.csproj -nowarn:msb3202,nu1503
1515
COPY . .
16-
WORKDIR /src/src/Services/Basket/Basket.API
16+
WORKDIR /src/Services/Basket/Basket.API
1717
RUN dotnet build --no-restore -c $BUILD_CONFIGURATION
1818

1919
ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

‎src/Services/Catalog/Catalog.API/Dockerfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ WORKDIR /src
88

99
COPY scripts scripts/
1010

11-
COPY src/ApiGateways/*/*.csproj /src/csproj-files/
12-
COPY src/ApiGateways/*/*/*.csproj /src/csproj-files/
13-
COPY src/BuildingBlocks/*/*/*.csproj /src/csproj-files/
14-
COPY src/Services/*/*/*.csproj /src/csproj-files/
15-
COPY src/Web/*/*.csproj /src/csproj-files/
11+
COPY ApiGateways/*/*.csproj csproj-files/
12+
COPY ApiGateways/*/*/*.csproj csproj-files/
13+
COPY BuildingBlocks/*/*/*.csproj csproj-files/
14+
COPY Services/*/*/*.csproj csproj-files/
15+
COPY Web/*/*.csproj csproj-files/
1616

1717
COPY . .
18-
WORKDIR /src/src/Services/Catalog/Catalog.API
18+
WORKDIR /src/Services/Catalog/Catalog.API
1919
RUN dotnet publish -c Release -o /app
2020

2121
FROM build as unittest
22-
WORKDIR /src/src/Services/Catalog/Catalog.UnitTests
22+
WORKDIR /src/Services/Catalog/Catalog.UnitTests
2323

2424
FROM build as functionaltest
25-
WORKDIR /src/src/Services/Catalog/Catalog.FunctionalTests
25+
WORKDIR /src/Services/Catalog/Catalog.FunctionalTests
2626

2727
FROM build AS publish
2828

2929
FROM base AS final
3030
WORKDIR /app
3131
COPY --from=publish /app .
32-
COPY --from=build /src/src/Services/Catalog/Catalog.API/Proto /app/Proto
33-
COPY --from=build /src/src/Services/Catalog/Catalog.API/eshop.pfx .
32+
COPY --from=build /src/Services/Catalog/Catalog.API/Proto /app/Proto
33+
COPY --from=build /src/Services/Catalog/Catalog.API/eshop.pfx .
3434
ENTRYPOINT ["dotnet", "Catalog.API.dll"]

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ EXPOSE 80
66

77
WORKDIR /src
88

9-
COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
10-
COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
11-
COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
12-
COPY ["src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "src/BuildingBlocks/EventBus/IntegrationEventLogEF/"]
13-
COPY ["src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "src/BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
14-
COPY ["src/Services/Catalog/Catalog.API/Catalog.API.csproj", "src/Services/Catalog/Catalog.API/"]
9+
COPY ["BuildingBlocks/EventBus/EventBus/EventBus.csproj", "BuildingBlocks/EventBus/EventBus/"]
10+
COPY ["BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "BuildingBlocks/EventBus/EventBusRabbitMQ/"]
11+
COPY ["BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "BuildingBlocks/EventBus/EventBusServiceBus/"]
12+
COPY ["BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "BuildingBlocks/EventBus/IntegrationEventLogEF/"]
13+
COPY ["BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
14+
COPY ["Services/Catalog/Catalog.API/Catalog.API.csproj", "Services/Catalog/Catalog.API/"]
1515

16-
RUN dotnet restore src/Services/Catalog/Catalog.API/Catalog.API.csproj -nowarn:msb3202,nu1503
16+
RUN dotnet restore Services/Catalog/Catalog.API/Catalog.API.csproj -nowarn:msb3202,nu1503
1717
COPY . .
18-
WORKDIR "/src/src/Services/Catalog/Catalog.API"
18+
WORKDIR "/src/Services/Catalog/Catalog.API"
1919
RUN dotnet build --no-restore -c $BUILD_CONFIGURATION
2020

2121
ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

0 commit comments

Comments
 (0)