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
d9945a9200
Fixed ignored js files when building image
2018-04-14 10:43:30 +02:00
David Britch
0b4b001497
Revert "Simplified the SettingsService in the mobile client."
2018-03-29 14:07:18 +01:00
eiximenis
0e119eac86
Merge branch 'xamarin-oidcclient' into bff
...
# Conflicts:
# .dockerignore
# docker-compose.override.yml
# docker-compose.yml
# eShopOnContainers-ServicesAndWebApps.sln
# k8s/deploy.ps1
# k8s/deployments.yaml
# k8s/frontend.yaml
# src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
# src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
2018-03-23 12:37:12 +01:00
Eduard Tomàs
47a33ddd05
BFF Purchase - WIP
2018-01-29 16:58:08 +01:00
Eduard Tomàs
9057635c4e
Support for running unit tests in docker
2018-01-19 17:18:00 +01:00
yanchenw
607a30491e
Optimize multistage build
2018-01-04 15:00:05 -08:00
yanchenw
e4fa15b813
Optimize multi-stage build Dockerfile
...
Remove explicitly copied dependencies, copy entire solution
into the conainter and depends on the cache to reduce build
time.
Addd temporary solution file which does not contains the
dcproj file to work around the issue that the dotnet cli
cannot handle dcproj.
2018-01-04 11:01:45 -08:00
Eduard Tomàs
6e51a9f391
Added global.json to dockerignore.
2017-12-18 12:52:05 +01:00
yanchenw
091ed81e7b
Converts to use multi-stage build Dockerfile
...
1. Changes the build context of all services to the root level to be
able to access the dependencies for each project.
2. Commented out the prepublish scripts, these steps are moved into the
Dockerfile
Did not change any script yet, need help to identify what scripts we
need to change.
2017-11-27 13:48:31 -08:00
