21 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
d9945a9200 Fixed ignored js files when building image 2018-04-14 10:43:30 +02:00
Marcos Cobeña Morián
51bb223663 Ignored MFractor's stuff 2018-03-19 12:21:32 +01:00
Igor Sychev
76dcd66c73 we don't need schema files for k8 in a repo. 2017-09-18 09:56:29 +03:00
Ramón Tomás
a3e63c11aa Merge from eShopOnContainers Dev 2017-06-26 13:51:49 +02:00
Eduard Tomas
5389b15483 unwanted file 2017-06-19 19:04:12 +02:00
Eduard Tomas
2af88e74c8 Merge remote-tracking branch 'eShopOnContainers/dev' into dev
# Conflicts:
#	README.md
#	docs/Enterprise-Application-Patterns-using-XamarinForms.pdf
#	docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf
2017-05-05 10:05:51 +02:00
Eduard Tomas
3153bf7654 Added missing IdSvr certificate! 2017-04-25 11:05:15 +02:00
RamonTC
1ccc87e743 Merge pull request #167 from andrelmp/dev
Upgrade to angular-cli and Angular 4
2017-04-25 10:29:31 +02:00
RamonTC
9c6b54a7fc Merge pull request #167 from andrelmp/dev
Upgrade to angular-cli and Angular 4
2017-04-25 10:29:31 +02:00
André Passos
d34b80393e remove .vscode folder and add to .gitignore 2017-04-17 10:43:39 -03:00
André Passos
eb2981f72d remove .vscode folder and add to .gitignore 2017-04-17 10:43:39 -03:00
Ramón Tomás
9e17d9c85e Added wwwroot/lib folders to gitignore 2017-04-11 16:05:27 +02:00
Ramón Tomás
cb4a3503df Added wwwroot/lib folders to gitignore 2017-04-11 16:05:27 +02:00
etomas
faa24c757c Docker files added again
docker-use-platform creates mark file
2017-03-01 12:03:37 +01:00
etomas
c0efde5021 Addind docker-compose.ci.build.yml to gitignore 2017-02-24 18:10:13 +01:00
etomas
79615664cf Dockerfiles for win and linux containers 2017-02-24 18:07:52 +01:00
Carlos Cañizares Estévez
a0c51d0e6f added file to gitignore 2016-11-24 15:53:00 +01:00
Carlos Cañizares Estévez
c424f0816a Web MVC site UI apperance 2016-10-21 05:46:30 +02:00
glennc
9dd626360a some initial dockerfiles and catalog work. Proof of concept more than anything else. 2016-09-14 11:35:36 -07:00
Cesar De la Torre
3cbaf41674 Initial commit 2016-09-06 15:14:51 -07:00