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 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							34a0c03434 
							
						 
					 
					
						
						
							
							Update dockerfile.develop to net3  
						
						
						
						
					 
					
						2019-10-31 09:45:18 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							08e9b2641a 
							
						 
					 
					
						
						
							
							Final adjustments to make envoy work with ingress and remove Polly from http calls  
						
						
						
						
					 
					
						2019-10-01 19:30:09 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							c124e9e1ef 
							
						 
					 
					
						
						
							
							ApiGW added to mesh. Ingress updated for Linkerd  
						
						
						
						
					 
					
						2019-09-30 11:36:51 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							bc8e33a8ea 
							
						 
					 
					
						
						
							
							Added web shoping agg to mesh  
						
						
						
						
					 
					
						2019-09-27 16:38:48 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							60998cbd5c 
							
						 
					 
					
						
						
							
							Fixing some generic issues  
						
						
						
						
					 
					
						2019-09-27 16:32:32 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							dc2e7c215b 
							
						 
					 
					
						
						
							
							updated charts for local k8s deployment  
						
						
						
						
					 
					
						2019-09-19 20:02:01 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							9367c320fa 
							
						 
					 
					
						
						
							
							missing word in comment :p  
						
						
						
						
					 
					
						2019-09-19 18:38:45 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							d68c9e40aa 
							
						 
					 
					
						
						
							
							Configuration of envoy routes and minor code fixes  
						
						
						
						
					 
					
						2019-09-19 18:26:04 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							a2053deb49 
							
						 
					 
					
						
						
							
							Final charts tunning and allowing Linkerd Mesh to be used  
						
						
						
						
					 
					
						2019-09-10 19:49:50 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							171ee62148 
							
						 
					 
					
						
						
							
							fixed ending 0 in values.yaml for catalog  
						
						
						
						
					 
					
						2019-09-10 16:14:56 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							f441fcf018 
							
						 
					 
					
						
						
							
							update to helm charts for grpc config  
						
						
						
						
					 
					
						2019-09-10 16:14:04 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							784ad9d414 
							
						 
					 
					
						
						
							
							updated config files  
						
						
						
						
					 
					
						2019-09-10 16:04:50 +02:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							faa7546e17 
							
						 
					 
					
						
						
							
							Add option to use local images for k8s deployment  
						
						
						
						
					 
					
						2019-08-16 19:58:27 +01:00 
						 
				 
			
				
					
						
							
							
								Mateusz Karkula 
							
						 
					 
					
						
						
						
						
							
						
						
							033ebd350e 
							
						 
					 
					
						
						
							
							Fix WebStatus HealthChecks replacement  
						
						
						
						
					 
					
						2019-08-09 20:11:45 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							0988dcd8c2 
							
						 
					 
					
						
						
							
							background  
						
						
						
						
					 
					
						2019-08-07 09:28:08 +02:00 
						 
				 
			
				
					
						
							
							
								ericuss 
							
						 
					 
					
						
						
						
						
							
						
						
							17dd9cebb1 
							
						 
					 
					
						
						
							
							remove all references of basket background  
						
						
						
						
					 
					
						2019-07-31 09:12:12 +02:00 
						 
				 
			
				
					
						
							
							
								Carlos Milán Figueredo 
							
						 
					 
					
						
						
						
						
							
						
						
							186b2eb534 
							
						 
					 
					
						
						
							
							Aligned with PowerShell version deploy-all.ps1  
						
						
						
						
					 
					
						2019-07-12 11:34:51 +02:00 
						 
				 
			
				
					
						
							
							
								Carlos Milán Figueredo 
							
						 
					 
					
						
						
						
						
							
						
						
							93c86fc33e 
							
						 
					 
					
						
						
							
							Default namespace, fixed AKS DNS and Ingress  
						
						... 
						
						
						
						Several fixes in this commit:
  * Added 'namespace' argument, default to 'eshop'.
  * Every Helm command (`helm install` and `helm ls` used with `helm delete`) will honor the namespace parameter. This way this script is no longer destructive with the Kubernetes cluster. Usage() has been updated accordingly.
  * Custom registry image push didn't honor `--docker-username` and `--docker-password`. A `docker login` has been added to fix the situation.
  * AKS DNS discovery was not working properly due to case sensitivity with the JMESPath to the HTTPApplicationRouteZoneName. A small two-entries array with iterative loop has been added ton ensure either way the AKS http routing DNS retrieval is successful.
  * Helm charts were enabled to use Kubernetes Ingress, but the `Ingress.spec.rules.host[]` was not honored with the `$dns` variable. This has been fixed in the `helm install` commands and now the script deploys the Ingress as expected. 
						
						
					 
					
						2019-07-11 18:30:34 +02:00 
						 
				 
			
				
					
						
							
							
								Carlos Milán Figueredo 
							
						 
					 
					
						
						
						
						
							
						
						
							d026eb44a4 
							
						 
					 
					
						
						
							
							Restored --docker-username reference in usage() lost in the last commit  
						
						
						
						
					 
					
						2019-07-10 13:29:25 +02:00 
						 
				 
			
				
					
						
							
							
								Carlos Milán Figueredo 
							
						 
					 
					
						
						
						
						
							
						
						
							00bf2470ce 
							
						 
					 
					
						
						
							
							Several improvement and fixes: image_tag check for linux- prefix, login procedure for custom registry, --docker-username normalization and --dns aks option documented at usage()  
						
						
						
						
					 
					
						2019-07-10 07:35:44 +02:00 
						 
				 
			
				
					
						
							
							
								Carlos Milán Figueredo 
							
						 
					 
					
						
						
						
						
							
						
						
							7684278f8b 
							
						 
					 
					
						
						
							
							Fixed --docker-password parameter handling and a typo in --docker-username at usage()  
						
						
						
						
					 
					
						2019-07-09 17:49:53 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							591086956d 
							
						 
					 
					
						
						
							
							grpc poc working on k8s, using envoy as a sidecar in catalog api  
						
						
						
						
					 
					
						2019-06-27 16:16:11 +02:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							0779a47565 
							
						 
					 
					
						
						
							
							Fix important comment formatting  🙄  
						
						
						
						
					 
					
						2019-05-23 16:11:35 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							df4663bd87 
							
						 
					 
					
						
						
							
							Handle empty Application Insights instrumentation key  
						
						
						
						
					 
					
						2019-05-23 15:49:44 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							045ff18ef2 
							
						 
					 
					
						
						
							
							Merge pull request  #1020  from DanielLarsenNZ/dev  
						
						... 
						
						
						
						Fixes error installing eShopOnContainers with Helm thru Powershell 
						
						
					 
					
						2019-05-23 15:41:38 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							72f68a1c98 
							
						 
					 
					
						
						
							
							Merge pull request  #988  from dariustehrani/helm_delete_fix  
						
						... 
						
						
						
						limit helm delete to eshop 
						
						
					 
					
						2019-04-29 18:03:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Larsen 
							
						 
					 
					
						
						
						
						
							
						
						
							1dacbb7a8e 
							
						 
					 
					
						
						
							
							Fixes   #1015  
						
						
						
						
					 
					
						2019-04-28 20:59:13 +12:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							c0e125f2bf 
							
						 
					 
					
						
						
							
							Merge from features/devspaces to dev  
						
						
						
						
					 
					
						2019-04-11 14:38:31 +02:00 
						 
				 
			
				
					
						
							
							
								Darius Tehrani 
							
						 
					 
					
						
						
						
						
							
						
						
							20297fc6b5 
							
						 
					 
					
						
						
							
							limit help delete to eshop  
						
						
						
						
					 
					
						2019-04-03 08:23:19 +00:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							e809029e2c 
							
						 
					 
					
						
						
							
							Final fixes to make it work under Devspaces  
						
						
						
						
					 
					
						2019-03-28 18:59:45 +01:00 
						 
				 
			
				
					
						
							
							
								jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							3c971132eb 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into features/addELKSupport  
						
						
						
						
					 
					
						2019-03-28 11:22:53 +01:00 
						 
				 
			
				
					
						
							
							
								jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							8d7d27cc91 
							
						 
					 
					
						
						
							
							Added Documentation  
						
						
						
						
					 
					
						2019-03-20 12:41:24 +01:00 
						 
				 
			
				
					
						
							
							
								jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							06e07914e1 
							
						 
					 
					
						
						
							
							First version with Kibana/ElasticSearch & Logstash, needs refactor  
						
						
						
						
					 
					
						2019-03-19 15:57:47 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							1f762a6bcf 
							
						 
					 
					
						
						
							
							devspaces scripts  
						
						
						
						
					 
					
						2019-03-15 19:52:34 +01:00 
						 
				 
			
				
					
						
							
							
								jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							7fcb625efa 
							
						 
					 
					
						
						
							
							Fixed documentation errors  
						
						
						
						
					 
					
						2019-03-13 16:46:56 +01:00 
						 
				 
			
				
					
						
							
							
								jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							26d4de4a3b 
							
						 
					 
					
						
						
							
							Fixed changes on deploy-all.ps1 on AKS  
						
						
						
						
					 
					
						2019-03-13 16:44:33 +01:00 
						 
				 
			
				
					
						
							
							
								jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							d70ea89743 
							
						 
					 
					
						
						
							
							Tested on AKS  
						
						
						
						
					 
					
						2019-03-13 16:41:49 +01:00 
						 
				 
			
				
					
						
							
							
								Maurits van Beusekom 
							
						 
					 
					
						
						
						
						
							
						
						
							954dd4893a 
							
						 
					 
					
						
						
							
							Correctly set the backing field for the use-local-k8s parameter  
						
						
						
						
					 
					
						2019-03-12 11:47:24 +01:00 
						 
				 
			
				
					
						
							
							
								Maurits van Beusekom 
							
						 
					 
					
						
						
						
						
							
						
						
							e5ee6d735c 
							
						 
					 
					
						
						
							
							Fix initialization of the use_custom_registry boolean  
						
						
						
						
					 
					
						2019-03-11 13:20:40 +01:00 
						 
				 
			
				
					
						
							
							
								Maurits van Beusekom 
							
						 
					 
					
						
						
						
						
							
						
						
							45755aff0b 
							
						 
					 
					
						
						
							
							Fix path error in docker-compose command  
						
						
						
						
					 
					
						2019-03-08 16:16:50 +01:00 
						 
				 
			
				
					
						
							
							
								Maurits van Beusekom 
							
						 
					 
					
						
						
						
						
							
						
						
							46590874a7 
							
						 
					 
					
						
						
							
							Build correct solution  
						
						
						
						
					 
					
						2019-03-08 14:03:14 +01:00 
						 
				 
			
				
					
						
							
							
								Maurits van Beusekom 
							
						 
					 
					
						
						
						
						
							
						
						
							047322f1a5 
							
						 
					 
					
						
						
							
							Added bash version of the Helm deploy script  
						
						
						
						
					 
					
						2019-03-08 11:56:07 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							b2252dc4ec 
							
						 
					 
					
						
						
							
							Webhooks api Devspaces  
						
						
						
						
					 
					
						2019-02-25 16:48:41 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							1c776776c9 
							
						 
					 
					
						
						
							
							Identity.API devspaces setup  
						
						
						
						
					 
					
						2019-02-25 15:35:33 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							631696c4ae 
							
						 
					 
					
						
						
							
							Updated helm charts to support devspaces  
						
						
						
						
					 
					
						2019-02-25 13:27:26 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							eed86811aa 
							
						 
					 
					
						
						
							
							Merge branch 'test-devspaces' of  https://github.com/dotnet-architecture/eShopOnContainers  into features/devspaces  
						
						
						
						
					 
					
						2019-02-12 15:55:16 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							0eae3c3ea3 
							
						 
					 
					
						
						
							
							Merge branch 'features/webhooks' into dev  
						
						
						
						
					 
					
						2019-02-11 15:19:50 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							5b237b0a8b 
							
						 
					 
					
						
						
							
							webhooks flow finished. Only missing bug in api that don't show the hooks  
						
						
						
						
					 
					
						2019-02-06 19:59:26 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							50a5f8b0b4 
							
						 
					 
					
						
						
							
							new helm charts for webhooks  
						
						
						
						
					 
					
						2019-02-06 10:21:47 +01:00