Ramón Tomás
|
c3e15969b9
|
Added Appinsights K8s telemetry initializer
|
2017-10-11 18:53:26 +02:00 |
|
Ramón Tomás
|
a04cef97ef
|
Added AppInsights service
|
2017-10-11 16:26:44 +02:00 |
|
Ramón Tomás
|
87b13de3b7
|
Merge branch 'dev' into eShopOnServiceFabric-Win
|
2017-09-14 14:42:42 +02:00 |
|
Dennis van der Stelt
|
e0c0a79623
|
Rename Basket.cs to CustomerBasket.cs
|
2017-09-13 16:25:02 +02:00 |
|
Ramón Tomás
|
49c825d193
|
Added BasePath to swagger endpoint
Override environment variables urls
|
2017-09-13 16:19:27 +02:00 |
|
Eduard Tomàs
|
7321d5e5fc
|
Base path fix and k8s config updated
|
2017-09-07 19:18:53 +02: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 |
|
Eduard Tomàs
|
8198126daf
|
Use dotnet multi-architecture images.
Removing docker-compose.windows.override (not needed as is identical to docker-compose.override)
|
2017-09-04 19:07:53 +02:00 |
|
RamonTC
|
4ea8f6814e
|
Merge pull request #299 from SychevIgor/SychevIgor/WindowsDockerFiles20
windows docker files update to 2.0 base images
|
2017-08-30 17:55:26 +02:00 |
|
Ramón Tomás
|
c9ff332b84
|
Fix merging duplicated ConfigureAuth method
|
2017-08-30 08:59:39 +02:00 |
|
Ramón Tomás
|
faea50f715
|
Merge
|
2017-08-30 08:08:01 +02:00 |
|
Igor Sychev
|
dc566ea2a1
|
nanowin
|
2017-08-30 08:48:06 +03: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 |
|
Unai Zorrilla Castro
|
6ac34cbdaa
|
Update functional tests
|
2017-08-29 12:48:04 +02:00 |
|
Unai Zorrilla Castro
|
4e37f0df27
|
Migrate Building Blocks to .NETStandard2.0 and .NETCoreApp2.0. Fix packages references. Update Basket.API to new templates on .NETCoreApp2.0
|
2017-08-29 10:20:13 +02:00 |
|
Ramón Tomás
|
01469da7d3
|
Fixed bug Swagger is not working for the services #290
|
2017-08-24 15:41:11 +02:00 |
|
Ramón Tomás
|
8288acf3a4
|
Update projects from netcore 2.0.0 preview to 2.0.0
Fix netcore 2.0.0 breaking changes in authentication middleware
|
2017-08-22 22:36:23 +02:00 |
|
Ramón Tomás
|
2baedadc7a
|
Merge from Dev
|
2017-08-22 19:46:53 +02:00 |
|
PLAINCONCEPTS\lruiz
|
737bddadc2
|
Fix issue #259
|
2017-08-22 18:03:12 +02:00 |
|
Ramón Tomás
|
3c39ec5092
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-07-14 14:53:35 +02:00 |
|
Ramón Tomás
|
d42033a83b
|
Added UI alert and circuit-breaker handlers for components that depend on Basket.api
|
2017-07-14 14:53:17 +02:00 |
|
Cesar De la Torre
|
c7c176c4c1
|
Changed HealthCheck Cache duration time (Zero == No Cache) configuration for the Basket microservice. This is better for demos and can be changed at any time.
|
2017-07-13 14:48:55 -07:00 |
|
Ramón Tomás
|
f39fdb92ca
|
Fix Failing middleware and move it to Basket.api
|
2017-07-13 17:35:19 +02:00 |
|
Ramón Tomás
|
d289ec00cf
|
Add swagger authorization option in APIs
|
2017-07-12 12:10:10 +02:00 |
|
Eduard Tomas
|
d9b9578e48
|
Merge remote-tracking branch 'origin/dev' into netcore2
# Conflicts:
# docker-compose.dcproj
# docker-compose.vs.debug.yml
# docker-compose.vs.release.yml
# src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
# src/Services/Marketing/Marketing.API/Startup.cs
# src/Web/WebMVC/Startup.cs
# src/Web/WebMVC/WebMVC.csproj
|
2017-07-11 12:01:45 +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 |
|
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
|
d65a112535
|
References updated to preview-2
code adjustements to work with preview-2
|
2017-06-29 18:36:57 +02:00 |
|
Ramón Tomás
|
a56f99f684
|
Fix merge
|
2017-06-26 18:05:02 +02:00 |
|
Ramón Tomás
|
a3e63c11aa
|
Merge from eShopOnContainers Dev
|
2017-06-26 13:51:49 +02:00 |
|
Eduard Tomas
|
ea129609d5
|
Basket.API nuget updated
|
2017-06-21 19:33:24 +02:00 |
|
Eduard Tomas
|
56902a5549
|
[WIP] Projects & Dockerfile migrated to 2.0
Lots of things to address yet, because nuget packages are still on 1.1
|
2017-06-21 19:03:48 +02:00 |
|
Ramón Tomás
|
4be61abdde
|
Merge new creation ordering workflow
|
2017-06-12 13:52:23 +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
|
4d07fecc3b
|
fix merge error
|
2017-05-30 18:35:09 +02:00 |
|
Christian Arenas
|
ea02ecc160
|
Merge branch 'azureredis' into dev
# Conflicts:
# src/Services/Basket/Basket.API/Startup.cs
# src/Services/Basket/Basket.API/appsettings.json
|
2017-05-30 18:32:28 +02:00 |
|
Christian Arenas
|
18167186c9
|
Apply EventBusConnectionChanges
|
2017-05-30 17:59:57 +02:00 |
|
Christian Arenas
|
83ae0d48fc
|
remove ServiceBusConnectionString variable from appsettings.json
|
2017-05-30 17:56:36 +02:00 |
|
Christian Arenas
|
6b480e3d41
|
Apply ConnectionString changes (remove condition)
|
2017-05-29 16:04:35 +02:00 |
|
Christian Arenas
|
e309d97d18
|
remove AzureRedisConnectionString variable from settings
|
2017-05-29 16:03:51 +02:00 |
|
Christian Arenas
|
0473a97225
|
change the "AzureRedisEnabled" condition to configure declaration
|
2017-05-29 12:42:51 +02:00 |
|
Christian Arenas
|
db7d2a3ff3
|
Add "AzureRedisConnectionString" environment variable and add a connectionString condition when "AzureRedisEnabled" environment variable is true
|
2017-05-29 11:01:56 +02:00 |
|
Christian Arenas
|
41a6814293
|
Add new connection string
|
2017-05-29 10:12:07 +02:00 |
|
Christian Arenas
|
cd790f276f
|
Update StackExchange.Redis version
|
2017-05-27 18:35:44 +02:00 |
|
Christian Arenas
|
c23d2551cd
|
Add new redis connection getting data from environment variable
|
2017-05-27 18:35:28 +02:00 |
|
Christian Arenas
|
b30d09fbf5
|
Add Redis connectionString to environment variable
|
2017-05-27 18:34:36 +02:00 |
|
Cesar De la Torre
|
4410e455e0
|
Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI.
|
2017-05-25 17:01:10 -07:00 |
|
Christian Arenas
|
ed0e548e2d
|
minor naming
|
2017-05-26 01:35:44 +02:00 |
|
Christian Arenas
|
e454940801
|
environment variable renaming
|
2017-05-24 19:23:14 +02:00 |
|
Christian Arenas
|
9a100c9a27
|
Remove retry policy from DefaultServiceBusPersisterConnection parameter
|
2017-05-24 18:59:29 +02:00 |
|