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 |
|
Cesar De la Torre Llorente
|
c3213df7ed
|
Setting IWebHostBuilder and IWebHost as explicit (instead of var) in BuildWebHost() from the generic OcelotApiGw.
|
2018-05-14 15:48:21 -07: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 |
|
Cesar De la Torre Llorente
|
5fd412174e
|
Eliminated multiple dockerfiles within the ApiGw-Base as they were not really used as a different image but the same. Also, updated references at the docker-compose.yml file.
|
2018-04-02 14:18:20 -07:00 |
|
Cesar De la Torre Llorente
|
e83f87b62d
|
Removed ENV ESHOP_API_GW from dockerfiles which is not used/needed.
|
2018-04-02 12:54:21 -07:00 |
|
eiximenis
|
5bb67596b9
|
k8s config updated
|
2018-03-14 18:25:26 +01:00 |
|
eiximenis
|
de37559c41
|
Files moved / names changes / csprojs updated / sln updated
|
2018-02-28 11:30:25 +01:00 |
|