7 Commits

Author SHA1 Message Date
ddrsql
91103a4a01 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	k8s/deployments.yaml
#	k8s/gen-k8s-env-aks.ps1
#	k8s/internalurls.yaml
#	k8s/ocelot/configuration-web-shopping.json
#	src/ApiGateways/ApiGw-Base/Program.cs
#	src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json
#	src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json
#	src/Services/Identity/Identity.API/Configuration/Config.cs
#	src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
#	src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
#	src/Web/WebMVC/AppSettings.cs
#	src/Web/WebMVC/Startup.cs
#	src/Web/WebSPA/AppSettings.cs
#	src/Web/WebSPA/Client/modules/shared/models/configuration.model.ts
#	src/Web/WebSPA/Client/modules/shared/services/configuration.service.ts
#	src/Web/WebSPA/Client/modules/shared/services/security.service.ts
2018-05-24 18:02:28 +08:00
Ramón Tomás
25c752c61a Added SignalR Hub service to k8s 2018-04-19 17:21:26 +02:00
ddrsql
9c516b6936 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
# Conflicts:
#	README.md
#	docker-compose.override.yml
#	docker-compose.prod.yml
#	docker-compose.yml
#	k8s/deploy.ps1
#	k8s/ocelot/deployment.yaml
#	src/ApiGateways/ApiGw-Base/Dockerfile
2018-04-17 12:24:13 +08:00
eiximenis
5b38d2bf98 Updated k8s file to use only ocelotapigw image 2018-04-03 18:01:38 +02:00
eiximenis
d9fb7e713c Error on ocelot config for k8s 2018-03-15 16:13:23 +01:00
eiximenis
5bb67596b9 k8s config updated 2018-03-14 18:25:26 +01:00
Eduard Tomàs
ea4e0ed6e8 Deploying ocelot to k8s
configuration to ocelot passed through a k8s volume
2018-01-11 18:18:16 +01:00