ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,426 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

115 Commits

Author SHA1 Message Date
Miguel Veloso
0c14810a33 Replace obsolete IHostingEnvironment for IWebHostEnvironment 2019-11-08 16:02:58 +00:00
Miguel Veloso
e8d99c06c9 Merge branch 'features/migration-dotnet3' into dotnet3-migration/dev-dotnet3 
# Conflicts:
#	README.md
#	docker-compose.override.yml
#	docker-compose.yml
#	k8s/helm/deploy-all.ps1
#	k8s/helm/webstatus/values.yaml
#	src/ApiGateways/ApiGw-Base/Dockerfile
#	src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
#	src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
#	src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
#	src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
#	src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
#	src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
#	src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj
#	src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
#	src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
#	src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
#	src/Services/Basket/Basket.API/Basket.API.csproj
#	src/Services/Basket/Basket.API/Dockerfile
#	src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj
#	src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj
#	src/Services/Catalog/Catalog.API/Catalog.API.csproj
#	src/Services/Catalog/Catalog.API/Dockerfile
#	src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj
#	src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj
#	src/Services/Identity/Identity.API/Dockerfile
#	src/Services/Identity/Identity.API/Identity.API.csproj
#	src/Services/Location/Locations.API/Dockerfile
#	src/Services/Location/Locations.API/Locations.API.csproj
#	src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj
#	src/Services/Marketing/Infrastructure/AzureFunctions/marketing-functions.csproj
#	src/Services/Marketing/Marketing.API/Dockerfile
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj
#	src/Services/Ordering/Ordering.API/Dockerfile
#	src/Services/Ordering/Ordering.API/Ordering.API.csproj
#	src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
#	src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
#	src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj
#	src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
#	src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
#	src/Services/Ordering/Ordering.SignalrHub/Dockerfile
#	src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
#	src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj
#	src/Services/Payment/Payment.API/Dockerfile
#	src/Services/Payment/Payment.API/Payment.API.csproj
#	src/Services/Webhooks/Webhooks.API/Dockerfile
#	src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj
#	src/Web/WebMVC/Dockerfile
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebSPA/Dockerfile
#	src/Web/WebSPA/WebSPA.csproj
#	src/Web/WebStatus/Dockerfile
#	src/Web/WebStatus/WebStatus.csproj
#	src/Web/WebStatus/appsettings.Development.json
#	src/Web/WebhookClient/Dockerfile
#	test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj
 2019-11-07 16:31:17 +00:00
Miguel Veloso
b34b8d2403 Sort package references 2019-11-06 11:14:19 +00:00
Miguel Veloso
9bbb37aed5 Sort package references 2019-11-06 10:40:03 +00:00
eiximenis
60998cbd5c Fixing some generic issues 2019-09-27 16:32:32 +02:00
eiximenis
d68c9e40aa Configuration of envoy routes and minor code fixes 2019-09-19 18:26:04 +02:00
eiximenis
9b57122f7a update to net3 rc1 2019-09-19 10:12:14 +02:00
eiximenis
a2053deb49 Final charts tunning and allowing Linkerd Mesh to be used 2019-09-10 19:49:50 +02:00
eiximenis
870363861f Update Dockerfiles for use /src as build context root 2019-08-28 14:11:29 +02:00
Miguel Veloso
17ab5170f1 Add view to display current configuration in WebStatus 2019-08-16 19:57:22 +01:00
Miguel Veloso
038b3caffa Update Dockerfiles to improve local build time 2019-08-16 19:56:30 +01:00
Mateusz Karkula
033ebd350e Fix WebStatus HealthChecks replacement 2019-08-09 20:11:45 +02:00
Erik Pique
50a1e1311e update preview7 2019-07-25 11:30:17 +02:00
Erik Pique
79405b89b0 modify retries count 2019-07-24 12:15:38 +02:00
Erik Pique
756142db94 upgrade net3 webapp 2019-07-23 12:14:09 +02:00
Erik Pique
31f77cb79e update version and image docker 2019-07-23 10:26:33 +02:00
eiximenis
577aca1d4c Basket.API updated to net3 2019-07-19 13:09:30 +02:00
eiximenis
437bdd7431 Using Directory.Build.props for handling versions. Needed to start the update to net3 2019-07-17 18:26:20 +02:00
eiximenis
58f156f417 fixing dockerfiles for windows 2019-05-28 11:49:39 +02:00
Miguel Veloso
c6ad3f2e14
Merge pull request #1026 from dotnet-architecture/fix/github-reported-jquery-vulnerabilities 
Fix GitHub reported vulnerabilities
 2019-05-03 15:51:04 +01:00
Miguel Veloso
3026a55be8 Update jquery to 3.4.1 to fix GitHub reported vulnerabilities 2019-05-02 19:06:39 +01:00
Miguel Veloso
1bf7c6fe6c Add health checks urls in appsettings.json 2019-05-02 17:42:26 +01:00
Miguel Veloso
ab94afdd3f
Merge pull request #1010 from LeeDumond/fix/missing-view-for-error 
add missing Error view for WebStatus project
 2019-05-02 14:07:11 +01:00
Lee Dumond
95ac1fe9bd use local bootstrap, not CDN 2019-05-01 14:26:06 -05:00
Miguel Veloso
914e8bd0cd Make the RUN restore-packages optional through an option on docker-compose 2019-04-22 18:10:53 +01:00
Lee Dumond
3224a77792 add missing Error view 2019-04-18 14:28:45 -05:00
Miguel Veloso
06018d4080 Streamline Dockerfiles 2019-04-13 08:23:40 +01:00
Miguel Veloso
be75d554f2 Inital Dockerfiles 2019-04-12 19:45:45 +01:00
jmanuelcorral
0706c724ad Changed default logstashUrl to null 2019-03-27 15:58:57 +01:00
jmanuelcorral
a0699501b1 Merged from Dev 2019-03-27 15:54:03 +01:00
jmanuelcorral
905f8552d9 Updated pointing to ELK external service for testing and demo purposes 2019-03-22 13:45:02 +01:00
jmanuelcorral
65b7b31d8d Done Updating versions 2019-03-21 16:38:01 +01:00
jmanuelcorral
06e07914e1 First version with Kibana/ElasticSearch & Logstash, needs refactor 2019-03-19 15:57:47 +01:00
Miguel Veloso
d5adb5f723 Update HealthChecks UI libraries to properly handle missing services. 2019-03-18 16:53:34 +00:00
Miguel Veloso
5c2b145ec2 Commented out local configuration, to avoid exception 2019-03-14 16:50:44 +00:00
Miguel Veloso
461c162056 Fix bad previous fix 2019-03-05 12:43:55 +00:00
Miguel Veloso
c19e1883f4 Fix JSON structure error. 2019-03-05 11:05:50 +00:00
Miguel Veloso
c1d7ca8951 Merge branch 'dev' into features/add-seq-sink 
# Conflicts SOLVED:
#	.gitignore
#	src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
#	src/Services/Basket/Basket.API/Basket.API.csproj
#	src/Services/Basket/Basket.API/Program.cs
#	src/Services/Basket/Basket.API/Startup.cs
#	src/Services/Catalog/Catalog.API/Catalog.API.csproj
#	src/Services/Catalog/Catalog.API/Program.cs
#	src/Services/Catalog/Catalog.API/Startup.cs
#	src/Services/Identity/Identity.API/Identity.API.csproj
#	src/Services/Identity/Identity.API/Program.cs
#	src/Services/Identity/Identity.API/Startup.cs
#	src/Services/Location/Locations.API/Locations.API.csproj
#	src/Services/Location/Locations.API/Program.cs
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Program.cs
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Services/Ordering/Ordering.API/Ordering.API.csproj
#	src/Services/Ordering/Ordering.API/Program.cs
#	src/Services/Ordering/Ordering.API/Startup.cs
#	src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
#	src/Services/Ordering/Ordering.SignalrHub/Program.cs
#	src/Services/Ordering/Ordering.SignalrHub/Startup.cs
#	src/Services/Payment/Payment.API/Payment.API.csproj
#	src/Services/Payment/Payment.API/Program.cs
#	src/Services/Payment/Payment.API/Startup.cs
#	src/Web/WebMVC/Program.cs
#	src/Web/WebMVC/Startup.cs
#	src/Web/WebStatus/Program.cs
#	src/Web/WebStatus/Startup.cs
#	src/Web/WebStatus/WebStatus.csproj
 2019-02-28 15:34:12 +00:00
Igor_Sychev
e98c625f81 runfix 2019-02-28 11:43:44 +03:00
Miguel Veloso
b6b0744c74 Standarize ApplicationContext logging property 2019-02-26 21:59:16 +00:00
Miguel Veloso
38a86f19c4 General refactoring for documentation 2019-02-26 21:55:04 +00:00
Igor_Sychev
185a5dcc31 minor packages update 
replace preview apis with production
replace EnableKubernetes with AddApplicationInsightsKubernetesEnricher
replace  loggerFactory.AddAzureWebAppDiagnostics(); with  loggerBuilder.AddAzureWebAppDiagnostics();
 2019-02-26 22:28:30 +03:00
Miguel Veloso
37409e8869 Add Seq to WebStatus 2019-02-18 16:53:29 +00:00
Ramón Tomás
a387f21029 fixed merge 2019-01-03 18:42:26 +01:00
Ramón Tomás
b9dcc80acd Merge Netcore2.2 branch 2019-01-03 18:41:58 +01:00
Ramón Tomás
dbf175f913 Fixed missing env variables in marketing.api in k8s scripts 
Added Resource path in webstatus UI when deploying with K8S
Added Liveness healthChecks
Updated k8s healthcheck configuration
 2019-01-03 17:11:56 +01:00
Ramón Tomás
fa0b1a7a6b Added serilog 2018-12-13 12:13:59 +01:00
Ramón Tomás
ffca2da0b3 Migrated to netcore 2.2 2018-12-11 13:51:58 +01:00
Ramón Tomás
25bef6dce4 Updated Webstatus startup 
Ignore temp healthchecksdb
 2018-12-04 21:49:14 +01:00
Ramón Tomás
0f6f4e6d14 Integrate HealthCheck to all eShop services and apps 
Integrate WebStatus with Healthcheck
 2018-11-30 17:43:22 +01:00