ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,038 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

81 Commits

Author SHA1 Message Date
Ramón Tomás
2cad76c134 Merge from Dev 2017-09-08 12:17:14 +02:00
Ramón Tomás
ca88050d9d Rename connectionstring variable in Idsrv 2017-09-08 12:12:49 +02:00
Cesar De la Torre
903b26d529 Setting to use SQL Server Developer Edition so there's no issue about any time bomb because of licensing or trial period. 2017-09-05 15:35:28 -07:00
Eduard Tomàs
6fd4f46058 Fix for rabbitMQ under windows containers. 
Also some config tweaking on windows
 2017-09-05 15:55:17 +02:00
Ramón Tomás
9ed7325e0e Downgrade Identity.api version due to compatibility issues 
Updated Test project version
Fix issue Idsrv token
 2017-08-29 18:11:30 +02:00
Ramón Tomás
58f3b5b274 Removed GracePeriod microservice and added as a HostService 2017-08-23 00:10:28 +02:00
Cesar De la Torre
cc18aa0b1a Changes order of containers in compose. Resources to the end 2017-08-14 17:35:56 -07:00
Cesar De la Torre
f61d979505 Fixing Azure Deployment scripts config plus improvements in docker-compose.override,yml 2017-08-14 13:32:36 -07:00
Cesar De la Torre
96c17ee09f Setting the AzureStorageEnabled environment variable at the docker-compose.override.yml instead of the AppSettings.json 2017-08-14 10:44:43 -07:00
Ramón Tomás
67adcec995 Update docker compose file 2017-08-03 13:06:57 +02:00
Cesar De la Torre
73be25e6cf Minor re-order of services in docker-compose files 2017-07-13 14:18:10 -07:00
Ramón Tomás
d289ec00cf Add swagger authorization option in APIs 2017-07-12 12:10:10 +02:00
Christian Arenas
f0f88aee98 Add PicBaseUrl with a replaced parameter 2017-07-11 12:43:06 +02:00
Christian Arenas
4a3e2d4612 rename ESHOP_AZURE_STORAGE_ACCOUNT_NAME/KEY variable to ESHOP_AZURE_STORAGE_CATALOG_NAME/KEY 2017-07-07 12:22:48 +02:00
Christian Arenas
06cbab4731 Merge branch 'feature/marketing-details-azure-function' into dev 
# Conflicts:
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/appsettings.json
#	src/Web/WebSPA/AppSettings.cs
#	test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs
 2017-07-07 11:56:57 +02:00
dsanz
8051114da9 Add Azure Storage check in Catalog health checks. 2017-07-06 11:38:45 +02:00
dsanz
eb7abbc984 Merge branch 'dev' into update-WebStatus 2017-07-05 11:08:59 +02:00
Eduard Tomas
7258a58f5b All docker compose to version 2.1 that seems to work in vsts hosted linux build agent 2017-07-04 14:52:56 +02:00
dsanz
a65e9c01eb Add Healthchecks to Locations.API and MArketing.API 2017-07-04 13:51:05 +02:00
Ramón Tomás
525040b9b6 Created Azure functions for details campaign 
Adapt MVC app to azure function details campaign
Adapt SPA app to azure function details campaign
 2017-06-30 16:31:22 +02:00
Ramón Tomás
f993463856 Implemented service bus for marketing.api locations.api graceperiodProcess payment.api 2017-06-30 08:59:26 +02:00
Eduard Tomas
10d03a68e3 Merge remote-tracking branch 'eShopOnAzure/dev' into dev 
# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
#	src/Services/Catalog/Catalog.API/Controllers/PicController.cs
#	src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
#	src/Services/Catalog/Catalog.API/settings.json
#	src/Services/Ordering/Ordering.API/Startup.cs
 2017-06-28 12:40:21 +02:00
Eduard Tomas
96c3f5c2bc Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev 
# Conflicts:
#	docker-compose.override.yml
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebMVC/wwwroot/css/shared/components/identity/identity.css
#	src/Web/WebMVC/wwwroot/css/site.min.css
#	src/Web/WebSPA/AppSettings.cs
 2017-06-28 12:20:20 +02:00
Ramón Tomás
a3e63c11aa Merge from eShopOnContainers Dev 2017-06-26 13:51:49 +02:00
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07: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
Christian Arenas
5208296b97 Add url to docker-compose 2017-06-15 19:22:47 +02:00
Christian Arenas
870ac403af Add Marketing endpoint 2017-06-15 02:20:33 +02:00
Ramón Tomás
9bf5670020 Created Marketing read data model 2017-06-13 17:31:37 +02:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Ramón Tomás
0337932697 Merge locations feature branch 2017-06-09 12:43:46 +02:00
Ramón Tomás
05bd964f2b Adapt Locations.api to nosql db 2017-06-08 17:33:55 +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
5794e25d6e Merge branch 'azurestorage' into dev 2017-05-30 18:35:18 +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
9866aae07c Change version of docker-compose from 2 to 2.1 for default values. 
I set "http://localhost:5101/api/v1/pic/" because docker-compose doesn't allow to declare another variable such as default value
 2017-05-30 17:24:46 +02:00
Ramón Tomás
9d5cde2057 #2412-Create Location Microservice 2017-05-30 15:01:58 +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
Ramón Tomás
e8dbf0c160 Rename grace period service in docker-compose files 2017-05-25 11:37:24 +02:00
Ramón Tomás
87e57b9a44 Merge from Dev 2017-05-18 15:39:31 +02:00
Christian Arenas
def828aeda Remove SagaManagerIntegrationEventService frrom SagaManager and remove GracePeriod from dockercompose 2017-05-17 19:41:49 +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
Christian Arenas
c5cca8f320 Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-05-08 13:59:59 +02:00
Christian Arenas
cde4c3a258 Create a SagaManager events 2017-05-08 10:48:06 +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