124 Commits

Author SHA1 Message Date
Eduard Tomas
561ba3b1ec 1st version of healthcheck & webstatus 2017-03-23 19:10:55 +01:00
DESKTOP-V1VLQ15\dsanz
f1ffb95abf Merge branch 'dev' into integration-events-rmq
# Conflicts:
#	docker-compose.override.yml
#	eShopOnContainers-ServicesAndWebApps.sln
2017-03-14 11:50:28 +01:00
dsanz
172367d9d1 Connect to the rabbitmq container using settings. 2017-03-13 11:03:35 +01:00
Cesar De la Torre
d7ab4d89d4 Added ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP to .env and docker-compose.prod.yml for production config so it does not impact to the localhost config. 2017-03-11 15:28:57 -08:00
Cesar De la Torre
69e5fe9f21 Using ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} from docker-compose.override.yml, as well. Notice that when using "localhost" from the browser URL using the MVC app, you'd need to use the 10.0.75.1 IP in a "Docker for Windows" environment.
Other than that, update the .env file with your IP or DNS name, and use that from the brower and the ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} in all the docker-compose files.
2017-03-11 14:49:55 -08:00
Cesar De la Torre
adabc1eb04 Merge branch 'master' of https://github.com/dotnet/eShopOnContainers 2017-03-03 17:34:32 -08:00
Cesar De la Torre
f9e670425a Cleaning up the docker-compose.override.yml by getting rid of commented URLs for a production enviroment 2017-03-03 17:33:12 -08:00
Charles Lowell
3df4f3a206 Configure service URLs via environment variables 2017-02-28 14:54:21 -08:00
Cesar De la Torre
405db61454 Fix for issue #60 https://github.com/dotnet/eShopOnContainers/issues/60 - STS cannot be reached from the MVC app 2017-02-22 18:41:15 -08:00
Bill Wagner
bb5d48735d update build script for Mac
Until adding these, the project would not build correctly on a Mac.

script working for SPA

Add execute permissions to build-bits.sh on macOS

fix a rebase / automatic merge issue.

Somehow, the MVC image got in there twice.

update content nodes

Bug workaround for for the CLI. It turns out that the CLI does not
handle content nodes that have multiple paths. Instead, multiple nodes
are needed.

use the standard names for the web docker images.

fix a typo and update the csproj content listings.

Also, execute nom install as part of publishing  the spa application.
2017-02-21 14:04:35 -05:00
etomas
20523925e5 SPA now works succesfully.
Solves #47
2017-02-17 13:26:42 +01:00
Cesar De la Torre
9ccf7f11ce Changes for CLI compatibility and New .PDF version 2017-02-16 12:31:53 -08:00
etomas
c7e362ac67 Docker files ready for the Visual Studio Docker Tools
Everything works as exepcted except SPA version which need further adjustments
2017-02-14 18:11:51 +01:00
PLAINCONCEPTS\ccanizares
e89adb5b30 SPA: Change banner and logo 2017-01-12 16:18:43 +01:00
PLAINCONCEPTS\ccanizares
2e84154e37 SPA: override with compose settings (environment variables) configuration in spa angular settings service. 2017-01-10 11:37:36 +01:00
PLAINCONCEPTS\ccanizares
7ad7a24a6e merge docker-compose 2017-01-09 10:39:47 +01:00
PLAINCONCEPTS\ccanizares
93bbd6516b Catalog Seed: Dynamic host url for image pics 2017-01-09 10:33:43 +01:00
Carlos Cañizares Estévez
a42f47b3f6 SPA: Observable for basket-status refresh when basket is dropped 2016-12-30 12:26:12 +01:00
Carlos Cañizares Estévez
c0c7d735e8 SPA: basket component, authentication service, basket list 2016-12-22 18:34:57 +01:00
Carlos Cañizares Estévez
ac146f4475 Added Unit Test Project for services 2016-12-22 13:20:12 +01:00
Carlos Cañizares Estévez
d8a0d9bb66 BasketApi: Add authorizationHeader (pass bearer from Swagger Ui to authorize request...).
MVC: Solve some design feedback (filter selector in catalog)

CatalogApi: Move models from infrastructure to Model folder.
2016-12-21 11:30:11 +01:00
Carlos Cañizares Estévez
10f3e17b55 Add Swagger to Basket Api
SQL databases with the same prefix for services
Move application tier to api tier in ordering api
2016-12-19 10:20:02 +01:00
Carlos Cañizares Estévez
31753fc057 MVC: Finish Orders integration (detail), validations, some refactor ...
Orders: Detail Query, new field in OrderDetail..
Identity: Validations in Register View, ensure all claims are returned in user end point..
2016-12-17 14:41:16 +01:00
CESARDELATORRE
d402126474 Docker Compose configuration is now split between the docker-compose.yml for base configuration that will always be used that way, and the docker-compose.override.yml config which has configuration depending on the deployment environment, like external ports (out of Docker Host) or any external UR or secret, like connection strings or SQL passwords. For more info, see: https://docs.docker.com/compose/extends/ 2016-12-15 14:35:35 -08:00