jmanuelcorral
5 years ago
104 changed files with 6044 additions and 3532 deletions
Split View
Diff Options
-
+69 -1README.md
-
+50 -0build/azure-devops/apigws/azure-pipelines.yml
-
+45 -0build/azure-devops/basket-api/azure-pipelines.yml
-
+45 -0build/azure-devops/catalog-api/azure-pipelines.yml
-
+45 -0build/azure-devops/identity-api/azure-pipelines.yml
-
+25 -0build/azure-devops/infrastructure/azure-pipelines.yml
-
+45 -0build/azure-devops/location-api/azure-pipelines.yml
-
+45 -0build/azure-devops/marketing-api/azure-pipelines.yml
-
+44 -0build/azure-devops/mobile-shopping-agg/azure-pipelines.yml
-
+47 -0build/azure-devops/ordering-api/azure-pipelines.yml
-
+45 -0build/azure-devops/payment-api/azure-pipelines.yml
-
+5 -0build/azure-devops/readme.md
-
+44 -0build/azure-devops/web-shopping-agg/azure-pipelines.yml
-
+45 -0build/azure-devops/webhooks-api/azure-pipelines.yml
-
+45 -0build/azure-devops/webhooks-client/azure-pipelines.yml
-
+45 -0build/azure-devops/webmvc/azure-pipelines.yml
-
+45 -0build/azure-devops/webspa/azure-pipelines.yml
-
+45 -0build/azure-devops/webstatus/azure-pipelines.yml
-
+2 -2deploy/az/servicebus/readme.md
-
+1 -1docker-compose.override.yml
-
+183 -207eShopOnContainers.sln
-
+0 -23hosts
-
+208 -0k8s/helm/deploy-all.sh
-
+2 -2src/ApiGateways/ApiGw-Base/Dockerfile
-
+2 -2src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
-
+2 -2src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
-
+2 -2src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
-
+2 -2src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
-
+2 -2src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
-
+7 -4src/BuildingBlocks/EventBus/EventBus/Extensions/GenericTypeExtensions.cs
-
+0 -0src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersistentConnection.cs
-
+41 -19src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
-
+0 -0src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersistentConnection.cs
-
+15 -8src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.cs
-
+0 -175src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj.bak
-
+2 -2src/Services/Basket/Basket.API/Basket.API.csproj
-
+2 -2src/Services/Basket/Basket.API/Dockerfile
-
+1 -1src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs
-
+2 -2src/Services/Catalog/Catalog.API/Catalog.API.csproj
-
+2 -2src/Services/Catalog/Catalog.API/Dockerfile
-
+2 -2src/Services/Catalog/Catalog.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
-
+2 -2src/Services/Identity/Identity.API/Dockerfile
-
+2 -2src/Services/Identity/Identity.API/Identity.API.csproj
-
+2 -2src/Services/Location/Locations.API/Dockerfile
-
+2 -2src/Services/Location/Locations.API/Locations.API.csproj
-
+2 -2src/Services/Marketing/Marketing.API/Dockerfile
-
+2 -2src/Services/Marketing/Marketing.API/Marketing.API.csproj
-
+1 -0src/Services/Ordering/Ordering.API/Application/Behaviors/LoggingBehavior.cs
-
+1 -0src/Services/Ordering/Ordering.API/Application/Behaviors/TransactionBehaviour.cs
-
+1 -0src/Services/Ordering/Ordering.API/Application/Behaviors/ValidatorBehavior.cs
-
+1 -0src/Services/Ordering/Ordering.API/Application/Commands/IdentifiedCommandHandler.cs
-
+1 -0src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/GracePeriodConfirmedIntegrationEventHandler.cs
-
+2 -1src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderPaymentFailedIntegrationEventHandler.cs
-
+1 -0src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderPaymentSuccededIntegrationEventHandler.cs
-
+1 -0src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderStockConfirmedIntegrationEventHandler.cs
-
+1 -0src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderStockRejectedIntegrationEventHandler.cs
-
+6 -5src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/UserCheckoutAcceptedIntegrationEventHandler.cs
-
+1 -0src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs
-
+2 -2src/Services/Ordering/Ordering.API/Dockerfile
-
+2 -2src/Services/Ordering/Ordering.API/Ordering.API.csproj
-
+2 -2src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
-
+2 -2src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
-
+7 -9src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
-
+1 -1src/Services/Ordering/Ordering.FunctionalTests/OrderingScenarios.cs
-
+0 -0src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/BuyerEntityTypeConfiguration.cs
-
+2 -2src/Services/Ordering/Ordering.SignalrHub/Dockerfile
-
+0 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToAwaitingValidationIntegrationEventHandler.cs
-
+1 -1src/Services/Ordering/Ordering.SignalrHub/NotificationHub.cs
-
+2 -2src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
-
+2 -2src/Services/Payment/Payment.API/Dockerfile
-
+2 -2src/Services/Payment/Payment.API/Payment.API.csproj
-
+2 -2src/Services/Webhooks/Webhooks.API/Dockerfile
-
+1 -1src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj
-
+2 -2src/Web/WebMVC/Dockerfile
-
+4 -1src/Web/WebMVC/Infrastructure/HttpClientRequestIdDelegatingHandler.cs
-
+3 -3src/Web/WebMVC/WebMVC.csproj
-
+4 -4src/Web/WebMVC/libman.json
-
+3 -3src/Web/WebSPA/Client/modules/basket/basket.service.ts
-
+2 -2src/Web/WebSPA/Client/modules/campaigns/campaigns.service.ts
-
+1 -1src/Web/WebSPA/Client/modules/catalog/catalog.component.html
-
+2 -2src/Web/WebSPA/Client/modules/catalog/catalog.module.ts
-
+3 -3src/Web/WebSPA/Client/modules/catalog/catalog.service.ts
-
+2 -2src/Web/WebSPA/Client/modules/orders/orders.service.ts
-
+2 -2src/Web/WebSPA/Dockerfile
-
+2 -2src/Web/WebSPA/WebSPA.csproj
-
+3 -0src/Web/WebSPA/appsettings.json
-
+4471 -2853src/Web/WebSPA/package-lock.json
-
+40 -24src/Web/WebSPA/package.json
-
+4 -1src/Web/WebSPA/tsconfig.json
-
+5 -5src/Web/WebSPA/web.config
-
+2 -2src/Web/WebStatus/Dockerfile
-
+39 -1src/Web/WebStatus/Program.cs
-
+12 -4src/Web/WebStatus/WebStatus.csproj
-
+83 -6src/Web/WebStatus/appsettings.Development.json
-
+3 -80src/Web/WebStatus/appsettings.json
-
+2 -2src/Web/WebhookClient/Dockerfile
-
+12 -4src/Web/WebhookClient/Pages/Index.cshtml
-
+4 -3src/Web/WebhookClient/Pages/RegisterWebhook.cshtml
-
+3 -1src/Web/WebhookClient/Pages/RegisterWebhook.cshtml.cs
-
+3 -3src/Web/WebhookClient/Pages/Shared/_Layout.cshtml
+ 69
- 1
README.md
View File
+ 50
- 0
build/azure-devops/apigws/azure-pipelines.yml
View File
| @ -0,0 +1,50 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/ApiGateways/* | |||
| - k8s/helm/apigwmm/* | |||
| - k8s/helm/apigwms/* | |||
| - k8s/helm/apigwwm/* | |||
| - k8s/helm/apigwws/* | |||
| exclude: | |||
| - src/ApiGateways/Mobile.Bff.Shopping/aggregator/* | |||
| - src/ApiGateways/Web.Bff.Shopping/aggregator/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build apigws | |||
| inputs: | |||
| dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push apigws | |||
| inputs: | |||
| dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/basket-api/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Services/Basket/* | |||
| - k8s/helm/basket-api/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build basket | |||
| inputs: | |||
| dockerComposeCommand: 'build basket.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push basket | |||
| inputs: | |||
| dockerComposeCommand: 'push basket.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/catalog-api/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Services/Catalog/* | |||
| - k8s/helm/catalog-api/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build catalog | |||
| inputs: | |||
| dockerComposeCommand: 'build catalog.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push catalog | |||
| inputs: | |||
| dockerComposeCommand: 'push catalog.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/identity-api/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Services/Identity/* | |||
| - k8s/helm/identity-api/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build identity | |||
| inputs: | |||
| dockerComposeCommand: 'build identity.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push identity | |||
| inputs: | |||
| dockerComposeCommand: 'push identity.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 25
- 0
build/azure-devops/infrastructure/azure-pipelines.yml
View File
| @ -0,0 +1,25 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - k8s/helm/basket-data/* | |||
| - k8s/helm/keystore-data/* | |||
| - k8s/helm/nosql-data/* | |||
| - k8s/helm/rabbitmq/* | |||
| - k8s/helm/sql-data/* | |||
| steps: | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/location-api/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Services/Location/* | |||
| - k8s/helm/locations-api/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build locations | |||
| inputs: | |||
| dockerComposeCommand: 'build locations.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push locations | |||
| inputs: | |||
| dockerComposeCommand: 'push locations.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/marketing-api/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Services/Marketing/* | |||
| - k8s/helm/marketing-api/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build marketing | |||
| inputs: | |||
| dockerComposeCommand: 'build marketing.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push marketing | |||
| inputs: | |||
| dockerComposeCommand: 'push marketing.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 44
- 0
build/azure-devops/mobile-shopping-agg/azure-pipelines.yml
View File
| @ -0,0 +1,44 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/ApiGateways/Mobile.Bff.Shopping/aggregator/* | |||
| - k8s/helm/mobileshoppingagg/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build mobileshoppingagg | |||
| inputs: | |||
| dockerComposeCommand: 'build mobileshoppingagg' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push mobileshoppingagg | |||
| inputs: | |||
| dockerComposeCommand: 'push mobileshoppingagg' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 47
- 0
build/azure-devops/ordering-api/azure-pipelines.yml
View File
| @ -0,0 +1,47 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Services/Ordering/* | |||
| - k8s/helm/ordering-api/* | |||
| - k8s/helm/ordering-backgroundtasks/* | |||
| - k8s/helm/ordering-signalrhub/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build ordering | |||
| inputs: | |||
| dockerComposeCommand: 'build ordering.api ordering.backgroundtasks ordering.signalrhub' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push ordering | |||
| inputs: | |||
| dockerComposeCommand: 'push ordering.api ordering.backgroundtasks ordering.signalrhub' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/payment-api/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Services/Payment/* | |||
| - k8s/helm/payment-api/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build payment | |||
| inputs: | |||
| dockerComposeCommand: 'build payment.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push payment | |||
| inputs: | |||
| dockerComposeCommand: 'push payment.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 5
- 0
build/azure-devops/readme.md
View File
| @ -0,0 +1,5 @@ | |||
| # Azure Devops build definitions | |||
| This folder contains the Azure Devops build definitions in YAML format. Each folder contains one `azure-pipelines.yml` that contains the build definition for one microservice (usually a Docker image, but some microservices generates more than one Docker image). | |||
| For more information about YAML builds read the [Azure DevOps documentation](https://docs.microsoft.com/en-us/azure/devops/pipelines/get-started-yaml?view=azure-devops). | |||
+ 44
- 0
build/azure-devops/web-shopping-agg/azure-pipelines.yml
View File
| @ -0,0 +1,44 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/ApiGateways/Web.Bff.Shopping/aggregator/* | |||
| - k8s/helm/webshoppingagg/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build webshoppingagg | |||
| inputs: | |||
| dockerComposeCommand: 'build webshoppingagg' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push webshoppingagg | |||
| inputs: | |||
| dockerComposeCommand: 'push webshoppingagg' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/webhooks-api/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Services/Webhooks/* | |||
| - k8s/helm/webhooks-api/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build webhooks | |||
| inputs: | |||
| dockerComposeCommand: 'build webhooks.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push webhooks | |||
| inputs: | |||
| dockerComposeCommand: 'push webhooks.api' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/webhooks-client/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Web/WebhookClient/* | |||
| - k8s/helm/webhooks-web/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build webhooks.client | |||
| inputs: | |||
| dockerComposeCommand: 'build webhooks.client' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push webhooks.client | |||
| inputs: | |||
| dockerComposeCommand: 'push webhooks.client' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/webmvc/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Web/WebMVC/* | |||
| - k8s/helm/webmvc/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build webmvc | |||
| inputs: | |||
| dockerComposeCommand: 'build webmvc' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push webmvc | |||
| inputs: | |||
| dockerComposeCommand: 'push webmvc' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/webspa/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Web/WebSPA/* | |||
| - k8s/helm/webspa/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build webspa | |||
| inputs: | |||
| dockerComposeCommand: 'build webspa' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push webspa | |||
| inputs: | |||
| dockerComposeCommand: 'push webspa' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 45
- 0
build/azure-devops/webstatus/azure-pipelines.yml
View File
| @ -0,0 +1,45 @@ | |||
| pool: | |||
| vmImage: 'ubuntu-16.04' | |||
| variables: | |||
| registryEndpoint: eshop-registry | |||
| trigger: | |||
| branches: | |||
| include: | |||
| - master | |||
| - dev | |||
| paths: | |||
| include: | |||
| - src/BuildingBlocks/* | |||
| - src/Web/WebStatus/* | |||
| - k8s/helm/webstatus/* | |||
| steps: | |||
| - task: DockerCompose@0 | |||
| displayName: Compose build webstatus | |||
| inputs: | |||
| dockerComposeCommand: 'build webstatus' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: DockerCompose@0 | |||
| displayName: Compose push webstatus | |||
| inputs: | |||
| dockerComposeCommand: 'push webstatus' | |||
| containerregistrytype: Container Registry | |||
| dockerRegistryEndpoint: $(registryEndpoint) | |||
| dockerComposeFile: docker-compose.yml | |||
| qualifyImageNames: true | |||
| projectName: "" | |||
| dockerComposeFileArgs: | | |||
| TAG=$(Build.SourceBranchName) | |||
| - task: CopyFiles@2 | |||
| inputs: | |||
| sourceFolder: $(Build.SourcesDirectory)/k8s/helm | |||
| targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| - task: PublishBuildArtifacts@1 | |||
| inputs: | |||
| pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm | |||
| artifactName: helm | |||
+ 2
- 2
deploy/az/servicebus/readme.md
View File
+ 1
- 1
docker-compose.override.yml
View File
+ 183
- 207
eShopOnContainers.sln
View File
+ 0
- 23
hosts
View File
| @ -1,23 +0,0 @@ | |||
| # Copyright (c) 1993-2009 Microsoft Corp. | |||
| # | |||
| # This is a sample HOSTS file used by Microsoft TCP/IP for Windows. | |||
| # | |||
| # This file contains the mappings of IP addresses to host names. Each | |||
| # entry should be kept on an individual line. The IP address should | |||
| # be placed in the first column followed by the corresponding host name. | |||
| # The IP address and the host name should be separated by at least one | |||
| # space. | |||
| # | |||
| # Additionally, comments (such as these) may be inserted on individual | |||
| # lines or following the machine name denoted by a '#' symbol. | |||
| # | |||
| # For example: | |||
| # | |||
| # 102.54.94.97 rhino.acme.com # source server | |||
| # 38.25.63.10 x.acme.com # x client host | |||
| # localhost name resolution is handled within DNS itself. | |||
| # 127.0.0.1 localhost | |||
| # ::1 localhost | |||
| 10.0.75.1 identity.service | |||
+ 208
- 0
k8s/helm/deploy-all.sh
View File
| @ -0,0 +1,208 @@ | |||
| #!/usr/bin/env bash | |||
| # http://redsymbol.net/articles/unofficial-bash-strict-mode | |||
| set -euo pipefail | |||
| usage() | |||
| { | |||
| cat <<END | |||
| deploy.sh: deploys the $app_name application to a Kubernetes cluster using Helm. | |||
| Parameters: | |||
| --aks-name <AKS cluster name> | |||
| The name of the AKS cluster. Required when the registry (using the -r parameter) is set to "aks". | |||
| --aks-rg <AKS resource group> | |||
| The resource group for the AKS cluster. Required when the registry (using the -r parameter) is set to "aks". | |||
| -b | --build-solution | |||
| Force a solution build before deployment (default: false). | |||
| -d | --dns <dns or ip address> | |||
| Specifies the external DNS/ IP address of the Kubernetes cluster. | |||
| When --use-local-k8s is specified the external DNS is automatically set to localhost. | |||
| -h | --help | |||
| Displays this help text and exits the script. | |||
| -n | --app-name <the name of the app> | |||
| Specifies the name of the application (default: eshop). | |||
| -p | --docker-password <docker password> | |||
| The Docker password used to logon to the custom registry, supplied using the -r parameter. | |||
| -r | --registry <container registry> | |||
| Specifies the container registry to use (required), e.g. myregistry.azurecr.io. | |||
| --skip-clean | |||
| Do not clean the Kubernetes cluster (default is to clean the cluster). | |||
| --skip-image-build | |||
| Do not build images (default is to build all images). | |||
| --skip-image-push | |||
| Do not upload images to the container registry (just run the Kubernetes deployment portion). | |||
| Default is to push the images to the container registry. | |||
| --skip-infrastructure | |||
| Do not deploy infrastructure resources (like sql-data, no-sql or redis). | |||
| This is useful for production environments where infrastructure is hosted outside the Kubernetes cluster. | |||
| -t | --tag <docker image tag> | |||
| The tag used for the newly created docker images. Default: newly created, date-based timestamp, with 1-minute resolution. | |||
| -u | --docker-user <docker username> | |||
| The Docker username used to logon to the custom registry, supplied using the -r parameter. | |||
| --use-local-k8s | |||
| Deploy to a locally installed Kubernetes (default: false). | |||
| It is assumed that the Kubernetes cluster has been granted access to the container registry. | |||
| If using AKS and ACR see link for more info: | |||
| https://docs.microsoft.com/en-us/azure/container-registry/container-registry-auth-aks | |||
| WARNING! THE SCRIPT WILL COMPLETELY DESTROY ALL DEPLOYMENTS AND SERVICES VISIBLE | |||
| FROM THE CURRENT CONFIGURATION CONTEXT. | |||
| It is recommended that you create a separate namespace and confguration context | |||
| for the $app_name application, to isolate it from other applications on the cluster. | |||
| For more information see https://kubernetes.io/docs/tasks/administer-cluster/namespaces/ | |||
| You can use namespace.yaml file (in the same directory) to create the namespace. | |||
| END | |||
| } | |||
| app_name='eshop' | |||
| aks_name='' | |||
| aks_rg='' | |||
| build_images='yes' | |||
| clean='yes' | |||
| build_solution='' | |||
| container_registry='' | |||
| docker_password='' | |||
| docker_username='' | |||
| dns='' | |||
| image_tag=$(date '+%Y%m%d%H%M') | |||
| push_images='yes' | |||
| skip_infrastructure='' | |||
| use_local_k8s='' | |||
| while [[ $# -gt 0 ]]; do | |||
| case "$1" in | |||
| --aks-name ) | |||
| aks_name="$2"; shift 2;; | |||
| --aks-rg ) | |||
| aks_rg="$2"; shift 2;; | |||
| -b | --build-solution ) | |||
| build_solution='yes'; shift ;; | |||
| -d | --dns ) | |||
| dns="$2"; shift 2;; | |||
| -h | --help ) | |||
| usage; exit 1 ;; | |||
| -n | --app-name ) | |||
| app_name="$2"; shift 2;; | |||
| -p | --docker-password ) | |||
| docker_password="$2"; shift;; | |||
| -r | --registry ) | |||
| container_registry="$2"; shift 2;; | |||
| --skip-clean ) | |||
| clean=''; shift ;; | |||
| --skip-image-build ) | |||
| build_images=''; shift ;; | |||
| --skip-image-push ) | |||
| push_images=''; shift ;; | |||
| --skip-infrastructure ) | |||
| skip_infrastructure='yes'; shift ;; | |||
| -t | --tag ) | |||
| image_tag="$2"; shift 2;; | |||
| -u | --docker-username ) | |||
| docker_username="$2"; shift 2;; | |||
| --use-local-k8s ) | |||
| use_local_k8s='yes'; shift ;; | |||
| *) | |||
| echo "Unknown option $1" | |||
| usage; exit 2 ;; | |||
| esac | |||
| done | |||
| if [[ $build_solution ]]; then | |||
| echo "#################### Building $app_name solution ####################" | |||
| dotnet publish -o obj/Docker/publish ../../eShopOnContainers-ServicesAndWebApps.sln | |||
| fi | |||
| export TAG=$image_tag | |||
| if [[ $build_images ]]; then | |||
| echo "#################### Building the $app_name Docker images ####################" | |||
| docker-compose -p ../.. -f ../../docker-compose.yml build | |||
| # Remove temporary images | |||
| docker rmi $(docker images -qf "dangling=true") | |||
| fi | |||
| if [[ $push_images ]]; then | |||
| echo "#################### Pushing images to the container registry ####################" | |||
| services=(basket.api catalog.api identity.api ordering.api marketing.api payment.api locations.api webmvc webspa webstatus) | |||
| for service in "${services[@]}" | |||
| do | |||
| echo "Pushing image for service $service..." | |||
| docker tag "eshop/$service:$image_tag" "$container_registry/$service:$image_tag" | |||
| docker push "$container_registry/$service:$image_tag" | |||
| done | |||
| fi | |||
| ingress_values_file="ingress_values.yaml" | |||
| if [[ $use_local_k8s ]]; then | |||
| ingress_values_file="ingress_values_dockerk8s.yaml" | |||
| dns="localhost" | |||
| fi | |||
| if [[ $dns == "aks" ]]; then | |||
| echo "#################### Begin AKS discovery based on the --dns aks setting. ####################" | |||
| if [[ -z $aks_name ]] || [[ -z $aks_rg ]]; then | |||
| echo "Error: When using -dns aks, MUST set -aksName and -aksRg too." | |||
| echo '' | |||
| usage | |||
| exit 1 | |||
| fi | |||
| echo "Getting DNS of AKS of AKS $aks_name (in resource group $aks_rg)" | |||
| dns="$(az aks show -n $aks_name -g $aks_rg --query addonProfiles.httpApplicationRouting.config.HTTPApplicationRoutingZoneName)" | |||
| if [[ -z dns ]]; then | |||
| echo "Error: when getting DNS of AKS $aks_name (in resource group $aks_rg). Please ensure AKS has httpRouting enabled AND Azure CLI is logged in and is of version 2.0.37 or higher." | |||
| exit 1 | |||
| fi | |||
| $dns=${dns//[\"]/""} | |||
| echo "DNS base found is $dns. Will use $aks_name.$dns for the app!" | |||
| fi | |||
| # Initialization & check commands | |||
| if [[ -z $dns ]]; then | |||
| echo "No DNS specified. Ingress resources will be bound to public IP." | |||
| fi | |||
| if [[ $clean ]]; then | |||
| echo "Cleaning previous helm releases..." | |||
| helm delete --purge $(helm ls -q) | |||
| echo "Previous releases deleted" | |||
| fi | |||
| use_custom_registry='' | |||
| if [[ -n $container_registry ]]; then | |||
| use_custom_registry='yes' | |||
| if [[ -z $docker_user ]] || [[ -z $docker_password ]]; then | |||
| echo "Error: Must use -u (--docker-username) AND -p (--docker-password) if specifying custom registry" | |||
| exit 1 | |||
| fi | |||
| fi | |||
| echo "#################### Begin $app_name installation using Helm ####################" | |||
| infras=(sql-data nosql-data rabbitmq keystore-data basket-data) | |||
| charts=(eshop-common apigwmm apigwms apigwwm apigwws basket-api catalog-api identity-api locations-api marketing-api mobileshoppingagg ordering-api ordering-backgroundtasks ordering-signalrhub payment-api webmvc webshoppingagg webspa webstatus webhooks-api webhooks-web) | |||
| if [[ !$skip_infrastructure ]]; then | |||
| for infra in "${infras[@]}" | |||
| do | |||
| echo "Installing infrastructure: $infra" | |||
| helm install --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --name="$app_name-$infra" $infra | |||
| done | |||
| fi | |||
| for chart in "${charts[@]}" | |||
| do | |||
| echo "Installing: $chart" | |||
| if [[ $use_custom_registry ]]; then | |||
| helm install --set inf.registry.server=$container_registry --set inf.registry.login=$docker_username --set inf.registry.pwd=$docker_password --set inf.registry.secretName=eshop-docker-scret --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always --name="$app_name-$chart" $chart | |||
| elif [[ $chart != "eshop-common" ]]; then # eshop-common is ignored when no secret must be deployed | |||
| helm install --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always --name="$app_name-$chart" $chart | |||
| fi | |||
| done | |||
| echo "FINISHED: Helm charts installed." | |||
+ 2
- 2
src/ApiGateways/ApiGw-Base/Dockerfile
View File
+ 2
- 2
src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
View File
+ 2
- 2
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
View File
+ 2
- 2
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
View File
+ 2
- 2
src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
View File
+ 2
- 2
src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
View File
src/Services/Ordering/Ordering.API/Application/Behaviors/BehaviorsHelperExtensions.cs → src/BuildingBlocks/EventBus/EventBus/Extensions/GenericTypeExtensions.cs
View File
src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersisterConnection.cs → src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersistentConnection.cs
View File
+ 41
- 19
src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
View File
src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersisterConnection.cs → src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersistentConnection.cs
View File
+ 15
- 8
src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.cs
View File
+ 0
- 175
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj.bak
View File
| @ -1,175 +0,0 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |||
| <PropertyGroup> | |||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | |||
| <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform> | |||
| <ProjectGuid>{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}</ProjectGuid> | |||
| <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | |||
| <OutputType>Exe</OutputType> | |||
| <RootNamespace>eShopOnContainers.TestRunner.iOS</RootNamespace> | |||
| <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> | |||
| <AssemblyName>eShopOnContainers.TestRunner.iOS</AssemblyName> | |||
| <NuGetPackageImportStamp> | |||
| </NuGetPackageImportStamp> | |||
| </PropertyGroup> | |||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' "> | |||
| <DebugSymbols>true</DebugSymbols> | |||
| <DebugType>full</DebugType> | |||
| <Optimize>false</Optimize> | |||
| <OutputPath>bin\iPhoneSimulator\Debug</OutputPath> | |||
| <DefineConstants>DEBUG</DefineConstants> | |||
| <ErrorReport>prompt</ErrorReport> | |||
| <WarningLevel>4</WarningLevel> | |||
| <ConsolePause>false</ConsolePause> | |||
| <MtouchArch>x86_64</MtouchArch> | |||
| <MtouchLink>SdkOnly</MtouchLink> | |||
| <MtouchDebug>True</MtouchDebug> | |||
| <MtouchSdkVersion>10.1</MtouchSdkVersion> | |||
| <MtouchProfiling>False</MtouchProfiling> | |||
| <MtouchFastDev>False</MtouchFastDev> | |||
| <MtouchUseLlvm>False</MtouchUseLlvm> | |||
| <MtouchUseThumb>False</MtouchUseThumb> | |||
| <MtouchEnableBitcode>False</MtouchEnableBitcode> | |||
| <MtouchUseSGen>False</MtouchUseSGen> | |||
| <MtouchUseRefCounting>False</MtouchUseRefCounting> | |||
| <OptimizePNGs>True</OptimizePNGs> | |||
| <MtouchTlsProvider>Default</MtouchTlsProvider> | |||
| <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler> | |||
| <MtouchFloat32>False</MtouchFloat32> | |||
| </PropertyGroup> | |||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' "> | |||
| <DebugType>none</DebugType> | |||
| <Optimize>true</Optimize> | |||
| <OutputPath>bin\iPhoneSimulator\Release</OutputPath> | |||
| <ErrorReport>prompt</ErrorReport> | |||
| <WarningLevel>4</WarningLevel> | |||
| <MtouchLink>None</MtouchLink> | |||
| <MtouchArch>x86_64</MtouchArch> | |||
| <ConsolePause>false</ConsolePause> | |||
| </PropertyGroup> | |||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' "> | |||
| <DebugSymbols>true</DebugSymbols> | |||
| <DebugType>full</DebugType> | |||
| <Optimize>false</Optimize> | |||
| <OutputPath>bin\iPhone\Debug</OutputPath> | |||
| <DefineConstants>DEBUG</DefineConstants> | |||
| <ErrorReport>prompt</ErrorReport> | |||
| <WarningLevel>4</WarningLevel> | |||
| <ConsolePause>false</ConsolePause> | |||
| <MtouchArch>ARMv7, ARM64</MtouchArch> | |||
| <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> | |||
| <CodesignKey>iPhone Developer</CodesignKey> | |||
| <MtouchDebug>true</MtouchDebug> | |||
| </PropertyGroup> | |||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> | |||
| <DebugType>none</DebugType> | |||
| <Optimize>true</Optimize> | |||
| <OutputPath>bin\iPhone\Release</OutputPath> | |||
| <ErrorReport>prompt</ErrorReport> | |||
| <WarningLevel>4</WarningLevel> | |||
| <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> | |||
| <MtouchArch>ARMv7, ARM64</MtouchArch> | |||
| <ConsolePause>false</ConsolePause> | |||
| <CodesignKey>iPhone Developer</CodesignKey> | |||
| </PropertyGroup> | |||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' "> | |||
| <DebugType>none</DebugType> | |||
| <Optimize>True</Optimize> | |||
| <OutputPath>bin\iPhone\Ad-Hoc</OutputPath> | |||
| <ErrorReport>prompt</ErrorReport> | |||
| <WarningLevel>4</WarningLevel> | |||
| <ConsolePause>False</ConsolePause> | |||
| <MtouchArch>ARMv7, ARM64</MtouchArch> | |||
| <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> | |||
| <BuildIpa>True</BuildIpa> | |||
| <CodesignProvision>Automatic:AdHoc</CodesignProvision> | |||
| <CodesignKey>iPhone Distribution</CodesignKey> | |||
| </PropertyGroup> | |||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' "> | |||
| <DebugType>none</DebugType> | |||
| <Optimize>True</Optimize> | |||
| <OutputPath>bin\iPhone\AppStore</OutputPath> | |||
| <ErrorReport>prompt</ErrorReport> | |||
| <WarningLevel>4</WarningLevel> | |||
| <ConsolePause>False</ConsolePause> | |||
| <MtouchArch>ARMv7, ARM64</MtouchArch> | |||
| <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> | |||
| <CodesignProvision>Automatic:AppStore</CodesignProvision> | |||
| <CodesignKey>iPhone Distribution</CodesignKey> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <Compile Include="Main.cs" /> | |||
| <Compile Include="AppDelegate.cs" /> | |||
| <None Include="app.config" /> | |||
| <None Include="Info.plist" /> | |||
| <Compile Include="Properties\AssemblyInfo.cs" /> | |||
| <InterfaceDefinition Include="Resources\LaunchScreen.xib" /> | |||
| <None Include="packages.config" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <Reference Include="System" /> | |||
| <Reference Include="System.Xml" /> | |||
| <Reference Include="System.Core" /> | |||
| <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | |||
| <HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath> | |||
| <Private>True</Private> | |||
| </Reference> | |||
| <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | |||
| <HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath> | |||
| <Private>True</Private> | |||
| </Reference> | |||
| <Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | |||
| <HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath> | |||
| <Private>True</Private> | |||
| </Reference> | |||
| <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | |||
| <HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath> | |||
| <Private>True</Private> | |||
| </Reference> | |||
| <Reference Include="Xamarin.iOS" /> | |||
| <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> | |||
| <HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll</HintPath> | |||
| <Private>True</Private> | |||
| </Reference> | |||
| <Reference Include="xunit.assert, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> | |||
| <HintPath>..\..\packages\xunit.assert.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.assert.dll</HintPath> | |||
| <Private>True</Private> | |||
| </Reference> | |||
| <Reference Include="xunit.core, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> | |||
| <HintPath>..\..\packages\xunit.extensibility.core.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.core.dll</HintPath> | |||
| <Private>True</Private> | |||
| </Reference> | |||
| <Reference Include="xunit.execution.dotnet, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> | |||
| <HintPath>..\..\packages\xunit.extensibility.execution.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.execution.dotnet.dll</HintPath> | |||
| <Private>True</Private> | |||
| </Reference> | |||
| <Reference Include="xunit.runner.devices, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL"> | |||
| <HintPath>..\..\packages\xunit.runner.devices.2.1.0\lib\Xamarin.iOS\xunit.runner.devices.dll</HintPath> | |||
| <Private>True</Private> | |||
| </Reference> | |||
| <Reference Include="xunit.runner.utility.dotnet, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> | |||
| <HintPath>..\..\packages\xunit.runner.utility.2.2.0-beta4-build3444\lib\netstandard1.1\xunit.runner.utility.dotnet.dll</HintPath> | |||
| <Private>True</Private> | |||
| </Reference> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <Content Include="AppDelegate.cs.txt" /> | |||
| <Content Include="Entitlements.plist" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <ProjectReference Include="..\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj"> | |||
| <Project>{f7b6a162-bc4d-4924-b16a-713f9b0344e7}</Project> | |||
| <Name>eShopOnContainers.UnitTests</Name> | |||
| </ProjectReference> | |||
| </ItemGroup> | |||
| <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> | |||
| <Import Project="..\..\packages\Xamarin.Forms.2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> | |||
| <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | |||
| <PropertyGroup> | |||
| <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText> | |||
| </PropertyGroup> | |||
| <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> | |||
| <Error Condition="!Exists('..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets'))" /> | |||
| </Target> | |||
| <Import Project="..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets" Condition="Exists('..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" /> | |||
| </Project> | |||
+ 2
- 2
src/Services/Basket/Basket.API/Basket.API.csproj
View File
+ 2
- 2
src/Services/Basket/Basket.API/Dockerfile
View File
+ 1
- 1
src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs
View File
+ 2
- 2
src/Services/Catalog/Catalog.API/Catalog.API.csproj
View File
+ 2
- 2
src/Services/Catalog/Catalog.API/Dockerfile
View File
+ 2
- 2
src/Services/Catalog/Catalog.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
View File
+ 2
- 2
src/Services/Identity/Identity.API/Dockerfile
View File
+ 2
- 2
src/Services/Identity/Identity.API/Identity.API.csproj
View File
+ 2
- 2
src/Services/Location/Locations.API/Dockerfile
View File
+ 2
- 2
src/Services/Location/Locations.API/Locations.API.csproj
View File
+ 2
- 2
src/Services/Marketing/Marketing.API/Dockerfile
View File
+ 2
- 2
src/Services/Marketing/Marketing.API/Marketing.API.csproj
View File
+ 1
- 0
src/Services/Ordering/Ordering.API/Application/Behaviors/LoggingBehavior.cs
View File
+ 1
- 0
src/Services/Ordering/Ordering.API/Application/Behaviors/TransactionBehaviour.cs
View File
+ 1
- 0
src/Services/Ordering/Ordering.API/Application/Behaviors/ValidatorBehavior.cs
View File
+ 1
- 0
src/Services/Ordering/Ordering.API/Application/Commands/IdentifiedCommandHandler.cs
View File
+ 1
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/GracePeriodConfirmedIntegrationEventHandler.cs
View File
+ 2
- 1
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderPaymentFailedIntegrationEventHandler.cs
View File
+ 1
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderPaymentSuccededIntegrationEventHandler.cs
View File
+ 1
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderStockConfirmedIntegrationEventHandler.cs
View File
+ 1
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderStockRejectedIntegrationEventHandler.cs
View File
+ 6
- 5
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/UserCheckoutAcceptedIntegrationEventHandler.cs
View File
+ 1
- 0
src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs
View File
+ 2
- 2
src/Services/Ordering/Ordering.API/Dockerfile
View File
+ 2
- 2
src/Services/Ordering/Ordering.API/Ordering.API.csproj
View File
+ 2
- 2
src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
View File
+ 2
- 2
src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
View File
+ 7
- 9
src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
View File
+ 1
- 1
src/Services/Ordering/Ordering.FunctionalTests/OrderingScenarios.cs
View File
src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/BuyerEntityTYpeConfiguration.cs → src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/BuyerEntityTypeConfiguration.cs
View File
+ 2
- 2
src/Services/Ordering/Ordering.SignalrHub/Dockerfile
View File
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/orderStatusChangedToAwaitingValidationIntegrationEventHandler.cs → src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToAwaitingValidationIntegrationEventHandler.cs
View File
+ 1
- 1
src/Services/Ordering/Ordering.SignalrHub/NotificationHub.cs
View File
+ 2
- 2
src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
View File
+ 2
- 2
src/Services/Payment/Payment.API/Dockerfile
View File
+ 2
- 2
src/Services/Payment/Payment.API/Payment.API.csproj
View File
+ 2
- 2
src/Services/Webhooks/Webhooks.API/Dockerfile
View File
+ 1
- 1
src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj
View File
+ 2
- 2
src/Web/WebMVC/Dockerfile
View File
+ 4
- 1
src/Web/WebMVC/Infrastructure/HttpClientRequestIdDelegatingHandler.cs
View File
+ 3
- 3
src/Web/WebMVC/WebMVC.csproj
View File
+ 4
- 4
src/Web/WebMVC/libman.json
View File
+ 3
- 3
src/Web/WebSPA/Client/modules/basket/basket.service.ts
View File
+ 2
- 2
src/Web/WebSPA/Client/modules/campaigns/campaigns.service.ts
View File
+ 1
- 1
src/Web/WebSPA/Client/modules/catalog/catalog.component.html
View File
+ 2
- 2
src/Web/WebSPA/Client/modules/catalog/catalog.module.ts
View File
| @ -1,13 +1,13 @@ | |||
| import { NgModule } from '@angular/core'; | |||
| import { BrowserModule } from '@angular/platform-browser'; | |||
| import { CommonModule } from '@angular/common' | |||
| import { SharedModule } from '../shared/shared.module'; | |||
| import { CatalogComponent } from './catalog.component'; | |||
| import { CatalogService } from './catalog.service'; | |||
| import { Pager } from '../shared/components/pager/pager'; | |||
| @NgModule({ | |||
| imports: [BrowserModule, SharedModule], | |||
| imports: [BrowserModule, SharedModule, CommonModule], | |||
| declarations: [CatalogComponent], | |||
| providers: [CatalogService] | |||
| }) | |||
+ 3
- 3
src/Web/WebSPA/Client/modules/catalog/catalog.service.ts
View File
+ 2
- 2
src/Web/WebSPA/Client/modules/orders/orders.service.ts
View File
+ 2
- 2
src/Web/WebSPA/Dockerfile
View File
+ 2
- 2
src/Web/WebSPA/WebSPA.csproj
View File
+ 3
- 0
src/Web/WebSPA/appsettings.json
View File
+ 4471
- 2853
src/Web/WebSPA/package-lock.json
File diff suppressed because it is too large
View File
+ 40
- 24
src/Web/WebSPA/package.json
View File
+ 4
- 1
src/Web/WebSPA/tsconfig.json
View File
+ 5
- 5
src/Web/WebSPA/web.config
View File
| @ -1,14 +1,14 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <configuration> | |||
| <!-- | |||
| Configure your application settings in appsettings.json. Learn more at https://go.microsoft.com/fwlink/?LinkId=786380 | |||
| --> | |||
| <system.webServer> | |||
| <handlers> | |||
| <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/> | |||
| <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" /> | |||
| </handlers> | |||
| <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/> | |||
| <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"> | |||
| <environmentVariables /> | |||
| </aspNetCore> | |||
| </system.webServer> | |||
| </configuration> | |||
| </configuration> | |||
+ 2
- 2
src/Web/WebStatus/Dockerfile
View File
+ 39
- 1
src/Web/WebStatus/Program.cs
View File
+ 12
- 4
src/Web/WebStatus/WebStatus.csproj
View File
+ 83
- 6
src/Web/WebStatus/appsettings.Development.json
View File
| @ -1,10 +1,87 @@ | |||
| { | |||
| "Logging": { | |||
| "IncludeScopes": false, | |||
| "LogLevel": { | |||
| "Default": "Debug", | |||
| "System": "Information", | |||
| "Microsoft": "Information" | |||
| "HealthChecks-UI": { | |||
| "HealthChecks": [ | |||
| { | |||
| "Name": "Ordering HTTP Check", | |||
| "Uri": "http://localhost:5102/hc" | |||
| }, | |||
| { | |||
| "Name": "Ordering HTTP Background Check", | |||
| "Uri": "http://localhost:5111/hc" | |||
| }, | |||
| { | |||
| "Name": "Basket HTTP Check", | |||
| "Uri": "http://localhost:5103/hc" | |||
| }, | |||
| { | |||
| "Name": "Catalog HTTP Check", | |||
| "Uri": "http://localhost:5101/hc" | |||
| }, | |||
| { | |||
| "Name": "Identity HTTP Check", | |||
| "Uri": "http://localhost:5105/hc" | |||
| }, | |||
| { | |||
| "Name": "Marketing HTTP Check", | |||
| "Uri": "http://localhost:5110/hc" | |||
| }, | |||
| { | |||
| "Name": "Locations HTTP Check", | |||
| "Uri": "http://localhost:5109/hc" | |||
| }, | |||
| { | |||
| "Name": "Payments HTTP Check", | |||
| "Uri": "http://localhost:5108/hc" | |||
| }, | |||
| { | |||
| "Name": "WebMVC HTTP Check", | |||
| "Uri": "http://localhost:5100/hc" | |||
| }, | |||
| { | |||
| "Name": "WebSPA HTTP Check", | |||
| "Uri": "http://localhost:5104/hc" | |||
| }, | |||
| { | |||
| "Name": "SignalR HTTP Check", | |||
| "Uri": "http://localhost:5112/hc" | |||
| }, | |||
| { | |||
| "Name": "Mobile Shopping API GW HTTP Check", | |||
| "Uri": "http://localhost:5200/hc" | |||
| }, | |||
| { | |||
| "Name": "Mobile Marketing API GW HTTP Check", | |||
| "Uri": "http://localhost:5201/hc" | |||
| }, | |||
| { | |||
| "Name": "Web Shopping API GW HTTP Check", | |||
| "Uri": "http://localhost:5202/hc" | |||
| }, | |||
| { | |||
| "Name": "Web Marketing API GW HTTP Check", | |||
| "Uri": "http://localhost:5203/hc" | |||
| }, | |||
| { | |||
| "Name": "Mobile Shopping Aggregator HTTP Check", | |||
| "Uri": "http://localhost:5120/hc" | |||
| }, | |||
| { | |||
| "Name": "Web Shopping Aggregator HTTP Check", | |||
| "Uri": "http://localhost:5121/hc" | |||
| } | |||
| ], | |||
| "EvaluationTimeOnSeconds": 10, | |||
| "MinimumSecondsBetweenFailureNotifications": 60 | |||
| }, | |||
| "Serilog": { | |||
| "SeqServerUrl": "http://localhost:5341/", | |||
| "MinimumLevel": { | |||
| "Default": "Information", | |||
| "Override": { | |||
| "Microsoft": "Warning", | |||
| "Microsoft.eShopOnContainers": "Information", | |||
| "System": "Warning" | |||
| } | |||
| } | |||
| } | |||
| } | |||