Ramón Tomás
a3e63c11aa
Merge from eShopOnContainers Dev
2017-06-26 13:51:49 +02:00
Cesar De la Torre
fdf550e7c2
Setting docker-compose files version all to '3' so it matches and you don't get the error 'Version mismatchdocker-compose.yml specifies version 3.0 but extension file docker-compose.override.yml uses version 2.0.'
2017-06-20 09:15:41 -07:00
Ramón Tomás
9bf5670020
Created Marketing read data model
2017-06-13 17:31:37 +02:00
Christian Arenas
32247c503d
Add marketing api
2017-06-01 20:15:21 +02:00
Christian Arenas
6082359f08
Add docker support
2017-06-01 10:10:20 +02:00
Christian Arenas
39e69ee4e0
Merge branch 'servicebus' into dev
...
# Conflicts:
# docker-compose.override.yml
# src/Services/Catalog/Catalog.API/CatalogSettings.cs
# src/Services/Catalog/Catalog.API/settings.json
2017-05-30 18:47:34 +02:00
Christian Arenas
2cad62d642
Add ESHOP_AZURE_REDIS variable from .env with default value
2017-05-30 17:30:01 +02:00
Christian Arenas
2d4f9d3323
Add ESHOP_AZURE_SERVICE_BUS variable from .env with default value
2017-05-29 15:42:09 +02:00
Christian Arenas
60c08ce9c5
Revert "Remove basket.data from docker-compose"
...
This reverts commit 9549786003d723493d865ba83420ed127bc34d53.
2017-05-29 11:06:22 +02:00
Christian Arenas
9549786003
Remove basket.data from docker-compose
2017-05-27 18:33:38 +02:00
Eduard Tomas
2741fde271
URLs on 80 - WIP
2017-05-11 08:06:40 +02:00
Ramón Tomás
afd3fe2fe5
Fix issue SPA HealthCheck Urls
2017-05-10 15:01:02 +02:00
Cesar De la Torre
8dc0761d7f
Removing the BasketUrl from the Ordering microservice since it is not used and it shouldn't be used in any case. Don't want synchronous Http communication between the microservices which would impact resiliency. Http only between the client apps and the first level of microservices (or API Gateways, if we had them).
2017-04-29 15:45:23 -07:00
Eduard Tomas
756cb3dafa
Merge branch 'master' into dev
...
# Conflicts:
# src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
# src/Services/Catalog/Catalog.API/Startup.cs
# src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
# src/Web/WebMVC/Startup.cs
2017-04-05 17:05:14 +02:00
Eduard Tomas
d00588ae37
Updated IdSvr for Xamarin-UWP signin related problems
2017-04-05 15:53:04 +02:00
Eduard Tomas
75629193b7
Xamarin callback client configurable
2017-04-03 10:18:56 +02:00
Cesar De la Torre
fa541444c7
Fixed bug in HealthChecks so the Catalog.API microservice checks the SQL database.
...
Also, added more UrlChecks to the MVC app so it checks all its dependencies.
Plus minor bugs/missing code in docker-compose.pro.yml that was evolved in the .override.yml
2017-03-30 18:25:19 -07:00
Ramón Tomás
fd0a30d62a
Merge from Dev
2017-03-28 16:37:36 +02:00
Eduard Tomas
5b9b92397d
Updates to dockerfile / docker-compose for windows containers
2017-03-24 13:15:40 +01:00
Eduard Tomas
561ba3b1ec
1st version of healthcheck & webstatus
2017-03-23 19:10:55 +01:00
Cesar De la Torre
b07677ae83
Updates for the docker-compose production env.
2017-03-13 16:43:40 -07: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
71987d03f7
Using the ".env" file for default environment variables like the ESHOP_EXTERNAL_DNS_NAME_OR_IP=192.168.88.248
2017-03-11 13:25:45 -08:00
etomas
12ecc78a18
Solves #112
2017-03-10 21:51:48 +01:00
Cesar De la Torre
f2999a46fb
Added docker-compose.prod.yml for testing with Xamarin app in remote devices, like in a WiFi, of for running the Web Apps from remote Browsers.
...
Start the solution with:
docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
Also, some clean-up.
2017-03-09 21:49:45 -08:00
