Tarun Jain
2 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 378 additions and 9 deletions
Split View
Diff Options
-
+1 -0src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
-
+1 -0src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
-
+61 -0src/ApiGateways/Yarp/WebShoppingAPIGateway/Dockerfile
-
+18 -0src/ApiGateways/Yarp/WebShoppingAPIGateway/Program.cs
-
+35 -0src/ApiGateways/Yarp/WebShoppingAPIGateway/Properties/launchSettings.json
-
+17 -0src/ApiGateways/Yarp/WebShoppingAPIGateway/WebShoppingAPIGateway.csproj
-
+8 -0src/ApiGateways/Yarp/WebShoppingAPIGateway/appsettings.Development.json
-
+134 -0src/ApiGateways/Yarp/WebShoppingAPIGateway/appsettings.json
-
+1 -0src/Services/Basket/Basket.API/Dockerfile
-
+1 -0src/Services/Catalog/Catalog.API/Dockerfile
-
+1 -0src/Services/Identity/Identity.API/Dockerfile
-
+1 -0src/Services/Ordering/Ordering.API/Dockerfile
-
+1 -0src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
-
+1 -0src/Services/Ordering/Ordering.SignalrHub/Dockerfile
-
+1 -0src/Services/Payment/Payment.API/Dockerfile
-
+1 -0src/Services/Webhooks/Webhooks.API/Dockerfile
-
+1 -0src/Web/WebMVC/Dockerfile
-
+2 -1src/Web/WebSPA/Client/angular.json
-
+8 -0src/Web/WebSPA/Client/src/proxy.conf.json
-
+0 -0src/Web/WebSPA/Client/src/proxy.conf.json.bak
-
+1 -0src/Web/WebSPA/Dockerfile
-
+10 -1src/Web/WebSPA/Startup.cs
-
+1 -0src/Web/WebStatus/Dockerfile
-
+1 -0src/Web/WebhookClient/Dockerfile
-
+11 -4src/docker-compose.override.yml
-
+4 -1src/docker-compose.yml
-
+56 -2src/eShopOnContainers-ServicesAndWebApps.sln
+ 1
- 0
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
View File
+ 1
- 0
src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
View File
+ 61
- 0
src/ApiGateways/Yarp/WebShoppingAPIGateway/Dockerfile
View File
| @ -0,0 +1,61 @@ | |||
| #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. | |||
| FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base | |||
| WORKDIR /app | |||
| EXPOSE 80 | |||
| FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build | |||
| WORKDIR /src | |||
| # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles | |||
| # to take advantage of Docker's build cache, to speed up local container builds | |||
| COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWebApps.sln" | |||
| COPY "ApiGateways/Yarp/WebShoppingAPIGateway/WebShoppingAPIGateway.csproj" "ApiGateways/Yarp/WebShoppingAPIGateway/WebShoppingAPIGateway.csproj" | |||
| COPY "ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj" "ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj" | |||
| COPY "ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj" "ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj" | |||
| COPY "BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj" "BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj" | |||
| COPY "BuildingBlocks/EventBus/EventBus/EventBus.csproj" "BuildingBlocks/EventBus/EventBus/EventBus.csproj" | |||
| COPY "BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj" "BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj" | |||
| COPY "BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj" "BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj" | |||
| COPY "BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj" "BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj" | |||
| COPY "BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj" "BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj" | |||
| COPY "BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj" "BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj" | |||
| COPY "Services/Basket/Basket.API/Basket.API.csproj" "Services/Basket/Basket.API/Basket.API.csproj" | |||
| COPY "Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj" "Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj" | |||
| COPY "Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj" "Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj" | |||
| COPY "Services/Catalog/Catalog.API/Catalog.API.csproj" "Services/Catalog/Catalog.API/Catalog.API.csproj" | |||
| COPY "Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj" "Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj" | |||
| COPY "Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj" "Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj" | |||
| COPY "Services/Identity/Identity.API/Identity.API.csproj" "Services/Identity/Identity.API/Identity.API.csproj" | |||
| COPY "Services/Ordering/Ordering.API/Ordering.API.csproj" "Services/Ordering/Ordering.API/Ordering.API.csproj" | |||
| COPY "Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj" "Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj" | |||
| COPY "Services/Ordering/Ordering.Domain/Ordering.Domain.csproj" "Services/Ordering/Ordering.Domain/Ordering.Domain.csproj" | |||
| COPY "Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj" "Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj" | |||
| COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj" "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj" | |||
| COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" | |||
| COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" | |||
| COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj" | |||
| COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" | |||
| COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" | |||
| COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj" | |||
| COPY "Web/WebMVC/WebMVC.csproj" "Web/WebMVC/WebMVC.csproj" | |||
| COPY "Web/WebSPA/WebSPA.csproj" "Web/WebSPA/WebSPA.csproj" | |||
| COPY "Web/WebStatus/WebStatus.csproj" "Web/WebStatus/WebStatus.csproj" | |||
| COPY "docker-compose.dcproj" "docker-compose.dcproj" | |||
| COPY "NuGet.config" "NuGet.config" | |||
| RUN dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" | |||
| COPY . . | |||
| WORKDIR /src/ApiGateways/Yarp/WebShoppingAPIGateway | |||
| RUN dotnet publish --no-restore -c Release -o /app | |||
| FROM build AS publish | |||
| FROM base AS final | |||
| WORKDIR /app | |||
| COPY --from=publish /app . | |||
| ENTRYPOINT ["dotnet", "WebShoppingAPIGateway.dll"] | |||
+ 18
- 0
src/ApiGateways/Yarp/WebShoppingAPIGateway/Program.cs
View File
| @ -0,0 +1,18 @@ | |||
| var builder = WebApplication.CreateBuilder(args); | |||
| builder.Services.AddReverseProxy().LoadFromConfig(builder.Configuration.GetSection("ReverseProxy")); | |||
| builder.Services.AddCors(options => | |||
| { | |||
| options.AddPolicy("customPolicy", builder => | |||
| { | |||
| builder.AllowAnyOrigin() | |||
| .AllowAnyMethod() | |||
| .AllowAnyHeader(); | |||
| }); | |||
| }); | |||
| var app = builder.Build(); | |||
| app.UseCors(); | |||
| app.MapGet("/", () => "Hello World!"); | |||
| app.MapReverseProxy(); | |||
| app.Run(); | |||
+ 35
- 0
src/ApiGateways/Yarp/WebShoppingAPIGateway/Properties/launchSettings.json
View File
| @ -0,0 +1,35 @@ | |||
| { | |||
| "iisSettings": { | |||
| "windowsAuthentication": false, | |||
| "anonymousAuthentication": true, | |||
| "iisExpress": { | |||
| "applicationUrl": "http://localhost:26551", | |||
| "sslPort": 0 | |||
| } | |||
| }, | |||
| "profiles": { | |||
| "WebShoppingAPIGateway": { | |||
| "commandName": "Project", | |||
| "launchBrowser": true, | |||
| "environmentVariables": { | |||
| "ASPNETCORE_ENVIRONMENT": "Development" | |||
| }, | |||
| "applicationUrl": "https://localhost:7118;http://localhost:5118", | |||
| "dotnetRunMessages": true | |||
| }, | |||
| "IIS Express": { | |||
| "commandName": "IISExpress", | |||
| "launchBrowser": true, | |||
| "environmentVariables": { | |||
| "ASPNETCORE_ENVIRONMENT": "Development" | |||
| } | |||
| }, | |||
| "Docker": { | |||
| "commandName": "Docker", | |||
| "launchBrowser": true, | |||
| "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}", | |||
| "publishAllPorts": true, | |||
| "useSSL": false | |||
| } | |||
| } | |||
| } | |||
+ 17
- 0
src/ApiGateways/Yarp/WebShoppingAPIGateway/WebShoppingAPIGateway.csproj
View File
| @ -0,0 +1,17 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | |||
| <PropertyGroup> | |||
| <TargetFramework>net6.0</TargetFramework> | |||
| <Nullable>enable</Nullable> | |||
| <ImplicitUsings>enable</ImplicitUsings> | |||
| <UserSecretsId>7c1733f8-e653-474b-9422-32c68ba1d44e</UserSecretsId> | |||
| <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> | |||
| <DockerfileContext>..\..\..</DockerfileContext> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" /> | |||
| <PackageReference Include="Yarp.ReverseProxy" Version="1.0.0" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 8
- 0
src/ApiGateways/Yarp/WebShoppingAPIGateway/appsettings.Development.json
View File
| @ -0,0 +1,8 @@ | |||
| { | |||
| "Logging": { | |||
| "LogLevel": { | |||
| "Default": "Information", | |||
| "Microsoft.AspNetCore": "Warning" | |||
| } | |||
| } | |||
| } | |||
+ 134
- 0
src/ApiGateways/Yarp/WebShoppingAPIGateway/appsettings.json
View File
| @ -0,0 +1,134 @@ | |||
| { | |||
| "Urls": "http://{ServiceHost}:{ServicePort}", | |||
| "Logging": { | |||
| "LogLevel": { | |||
| "Default": "Information", | |||
| "Microsoft.AspNetCore": "Warning" | |||
| } | |||
| }, | |||
| "AllowedHosts": "*", | |||
| "ReverseProxy": { | |||
| "Routes": { | |||
| "minimumroute": { | |||
| "ClusterId": "minimumcluster", | |||
| "Match": { | |||
| "Path": "{**catch-all}" | |||
| } | |||
| }, | |||
| "catalog": { | |||
| "ClusterId": "catalog", | |||
| "CorsPolicy": "customPolicy", | |||
| "Match": { | |||
| "Methods": [ "GET", "POST" ], | |||
| "Hosts": "host.docker.internal", | |||
| "Path": "/c/{**catch-all}" | |||
| }, | |||
| "Transforms": [ | |||
| { | |||
| "PathRemovePrefix": "/c" | |||
| } | |||
| ] | |||
| }, | |||
| "ordering": { | |||
| "ClusterId": "ordering", | |||
| "CorsPolicy": "customPolicy", | |||
| "Match": { | |||
| "Methods": [ "GET", "POST" ], | |||
| "Hosts": "host.docker.internal", | |||
| "Path": "/o/{**catch-all}" | |||
| }, | |||
| "Transforms": [ | |||
| { | |||
| "PathRemovePrefix": "/o" | |||
| } | |||
| ] | |||
| }, | |||
| "signalr-hub": { | |||
| "ClusterId": "signalr-hub", | |||
| "CorsPolicy": "customPolicy", | |||
| "Match": { | |||
| "Methods": [ "GET", "POST" ], | |||
| "Hosts": "host.docker.internal", | |||
| "Path": "/hub/{**catch-all}" | |||
| }, | |||
| "Transforms": [ | |||
| { | |||
| "PathRemovePrefix": "/hub" | |||
| } | |||
| ] | |||
| }, | |||
| "basket": { | |||
| "ClusterId": "basket", | |||
| "CorsPolicy": "customPolicy", | |||
| "Match": { | |||
| "Methods": [ "GET", "POST" ], | |||
| "Hosts": "host.docker.internal", | |||
| "Path": "/b/{**catch-all}" | |||
| }, | |||
| "Transforms": [ | |||
| { | |||
| "PathRemovePrefix": "/b" | |||
| } | |||
| ] | |||
| }, | |||
| "shoppingagg": { | |||
| "ClusterId": "shoppingagg", | |||
| "CorsPolicy": "customPolicy", | |||
| "Match": { | |||
| "Methods": [ "GET", "POST" ], | |||
| "Hosts": "host.docker.internal", | |||
| "Path": "/{**catch-all}" | |||
| }, | |||
| "Transforms": [ | |||
| { | |||
| "PathPattern": "/{**catch-all}" | |||
| } | |||
| ] | |||
| } | |||
| }, | |||
| "Clusters": { | |||
| "minimumcluster": { | |||
| "Destinations": { | |||
| "httpbin.org": { | |||
| "Address": "https://www.microsoft.com/" | |||
| } | |||
| } | |||
| }, | |||
| "catalog": { | |||
| "Destinations": { | |||
| "catalog_destination": { | |||
| "Address": "http://catalog-api/" | |||
| } | |||
| } | |||
| }, | |||
| "ordering": { | |||
| "Destinations": { | |||
| "catalog_destination": { | |||
| "Address": "http://ordering-api/" | |||
| } | |||
| } | |||
| }, | |||
| "signalr-hub": { | |||
| "Destinations": { | |||
| "catalog_destination": { | |||
| "Address": "http://ordering-signalrhub/" | |||
| } | |||
| } | |||
| }, | |||
| "basket": { | |||
| "Destinations": { | |||
| "catalog_destination": { | |||
| "Address": "http://basket-api/" | |||
| } | |||
| } | |||
| }, | |||
| "shoppingagg": { | |||
| "Destinations": { | |||
| "catalog_destination": { | |||
| "Address": "http://webshoppingagg/" | |||
| } | |||
| } | |||
| } | |||
| } | |||
| } | |||
| } | |||
+ 1
- 0
src/Services/Basket/Basket.API/Dockerfile
View File
+ 1
- 0
src/Services/Catalog/Catalog.API/Dockerfile
View File
+ 1
- 0
src/Services/Identity/Identity.API/Dockerfile
View File
+ 1
- 0
src/Services/Ordering/Ordering.API/Dockerfile
View File
+ 1
- 0
src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
View File
+ 1
- 0
src/Services/Ordering/Ordering.SignalrHub/Dockerfile
View File
+ 1
- 0
src/Services/Payment/Payment.API/Dockerfile
View File
+ 1
- 0
src/Services/Webhooks/Webhooks.API/Dockerfile
View File
+ 1
- 0
src/Web/WebMVC/Dockerfile
View File
+ 2
- 1
src/Web/WebSPA/Client/angular.json
View File
+ 8
- 0
src/Web/WebSPA/Client/src/proxy.conf.json
View File
| @ -0,0 +1,8 @@ | |||
| { | |||
| "/api": { | |||
| "target": "http://host.docker.internal:5202", | |||
| "secure": false, | |||
| "changeOrigin": true, | |||
| "logLevel": "debug" | |||
| } | |||
| } | |||