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
Ramón Tomás
8a19fad3a5
Created Payment.api microservice
2017-04-28 15:04:38 +02: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
Eduard Tomas
202882aa7c
Fixed healthcheck errors
2017-03-31 12:47: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
e08fe895a3
Added MVC and SPA Apps to healthChecker
...
Added styles to view
2017-03-28 16:16:01 +02:00
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
