ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 062de66513d54008f2c5aecb9b538aa6fe491746 into 4596d7aa99f841206e486e910d20b525cd48daf2

Browse Source
This commit is contained in:
Tarun Jain 2022-11-22 17:11:49 +01:00 committed by GitHub
commit 2960f10714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 378 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

1
src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

61
src/ApiGateways/Yarp/WebShoppingAPIGateway/Dockerfile Normal file
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
src/ApiGateways/Yarp/WebShoppingAPIGateway/Program.cs Normal file
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
src/ApiGateways/Yarp/WebShoppingAPIGateway/Properties/launchSettings.json Normal file
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
src/ApiGateways/Yarp/WebShoppingAPIGateway/WebShoppingAPIGateway.csproj Normal file
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
src/ApiGateways/Yarp/WebShoppingAPIGateway/appsettings.Development.json Normal file
View File

@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}

134
src/ApiGateways/Yarp/WebShoppingAPIGateway/appsettings.json Normal file
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
src/Services/Basket/Basket.API/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

1
src/Services/Catalog/Catalog.API/Dockerfile
View File

@ -10,6 +10,7 @@ WORKDIR /src
# 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"

1
src/Services/Identity/Identity.API/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

1
src/Services/Ordering/Ordering.API/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

1
src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

1
src/Services/Ordering/Ordering.SignalrHub/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

1
src/Services/Payment/Payment.API/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

1
src/Services/Webhooks/Webhooks.API/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

1
src/Web/WebMVC/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

3
src/Web/WebSPA/Client/angular.json
View File

@ -53,7 +53,8 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "WebSPA:build"
"browserTarget": "WebSPA:build",
"proxyConfig": "src/proxy.conf.json"
},
"configurations": {
"production": {

8
src/Web/WebSPA/Client/src/proxy.conf.json Normal file
View File

@ -0,0 +1,8 @@
{
"/api": {
"target": "http://host.docker.internal:5202",
"secure": false,
"changeOrigin": true,
"logLevel": "debug"
}
}

0
src/Web/WebSPA/Client/src/proxy.conf.json.bak Normal file
View File

1
src/Web/WebSPA/Dockerfile
View File

@ -20,6 +20,7 @@ WORKDIR /src
# Create this "restore-solution" section by running ./Create-DockerfileSolutionRestore.ps1, to optimize build cache reuse
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"

11
src/Web/WebSPA/Startup.cs
View File

@ -35,7 +35,15 @@ public class Startup
})
.PersistKeysToStackExchangeRedis(ConnectionMultiplexer.Connect(Configuration["DPConnectionString"]), "DataProtection-Keys");
}
services.AddCors(options =>
{
options.AddPolicy("customPolicy", builder =>
{
builder.AllowAnyOrigin()
.AllowAnyHeader()
.AllowAnyMethod();
});
});
// Add Antiforgery services and configure the header name that angular will use by default.
services.AddAntiforgery(options => options.HeaderName = "X-XSRF-TOKEN");
@ -102,6 +110,7 @@ public class Startup
app.UseSpaStaticFiles();
}
app.UseRouting();
app.UseCors("customPolicy");
app.UseEndpoints(endpoints =>
{
endpoints.MapDefaultControllerRoute();

1
src/Web/WebStatus/Dockerfile
View File

@ -9,6 +9,7 @@ WORKDIR /src
# 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"

1
src/Web/WebhookClient/Dockerfile
View File

@ -10,6 +10,7 @@ WORKDIR /src
# 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"

15
src/docker-compose.override.yml
View File

@ -181,11 +181,18 @@ services:
- "15200:8001"
webshoppingapigw:
volumes:
- ./ApiGateways/Envoy/config/webshopping:/etc/envoy
environment:
- ASPNETCORE_ENVIRONMENT=Development
- IdentityUrl=http://identity-api
- CatalogUrlHC=http://catalog-api/hc
- OrderingUrlHC=http://ordering-api/hc
- IdentityUrlHC=http://identity-api/hc
- BasketUrlHC=http://basket-api/hc
- PaymentUrlHC=http://payment-api/hc
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
ports:
- "5202:80"
- "15202:8001"
- "5202:80"
- "15202:8001"
mobileshoppingagg:
environment:

5
src/docker-compose.yml
View File

@ -158,4 +158,7 @@ services:
- webhooks-api
webshoppingapigw:
image: envoyproxy/envoy:v1.11.1
image: ${REGISTRY:-eshop}/webshoppingapigw:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: ApiGateways/Yarp/WebShoppingAPIGateway/Dockerfile

58
src/eShopOnContainers-ServicesAndWebApps.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29020.237
# Visual Studio Version 17
VisualStudioVersion = 17.1.32228.430
MinimumVisualStudioVersion = 10.0.40219.1
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}"
EndProject
@ -124,6 +124,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{373D8AA1
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventBus.Tests", "BuildingBlocks\EventBus\EventBus.Tests\EventBus.Tests.csproj", "{95D735BE-2899-4495-BE3F-2600E93B4E3C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Yarp", "Yarp", "{E916275D-CDDB-4B43-9A40-43F223C65980}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebShoppingAPIGateway", "ApiGateways\Yarp\WebShoppingAPIGateway\WebShoppingAPIGateway.csproj", "{D5FD5EC0-7FA3-4417-A618-870E8721F66D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@ -1530,6 +1534,54 @@ Global
{95D735BE-2899-4495-BE3F-2600E93B4E3C}.Release|x64.Build.0 = Release|Any CPU
{95D735BE-2899-4495-BE3F-2600E93B4E3C}.Release|x86.ActiveCfg = Release|Any CPU
{95D735BE-2899-4495-BE3F-2600E93B4E3C}.Release|x86.Build.0 = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|ARM.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|iPhone.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|x64.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|x64.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|x86.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.AppStore|x86.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|ARM.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|iPhone.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|x64.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|x64.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|x86.ActiveCfg = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Debug|x86.Build.0 = Debug|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|Any CPU.Build.0 = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|ARM.ActiveCfg = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|ARM.Build.0 = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|iPhone.ActiveCfg = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|iPhone.Build.0 = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|x64.ActiveCfg = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|x64.Build.0 = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|x86.ActiveCfg = Release|Any CPU
{D5FD5EC0-7FA3-4417-A618-870E8721F66D}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -1588,6 +1640,8 @@ Global
{B62E859F-825E-4C8B-93EC-5966EACFD026} = {798BFC44-2CCD-45FA-B37A-5173B03C2B30}
{373D8AA1-36BE-49EC-89F0-6CB736666285} = {807BB76E-B2BB-47A2-A57B-3D1B20FF5E7F}
{95D735BE-2899-4495-BE3F-2600E93B4E3C} = {373D8AA1-36BE-49EC-89F0-6CB736666285}
{E916275D-CDDB-4B43-9A40-43F223C65980} = {77849D35-37D4-4802-81DC-9477B2775A40}
{D5FD5EC0-7FA3-4417-A618-870E8721F66D} = {E916275D-CDDB-4B43-9A40-43F223C65980}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}