David Britch
e519fbde43
Merge branch 'bff' into xamarin-settings
2018-03-29 13:52:03 +01:00
Cesar De la Torre Llorente
7c446d9ffd
Upgraded to version: '3.4' in docker-compose files because since recent versions, VISUAL STUDIO FOR MAC requires docker-compose '3.4' in order to be able to F5 or Ctrl+F5 a Docker solution.
2018-03-26 16:23:00 -07:00
eiximenis
0e119eac86
Merge branch 'xamarin-oidcclient' into bff
...
# Conflicts:
# .dockerignore
# docker-compose.override.yml
# docker-compose.yml
# eShopOnContainers-ServicesAndWebApps.sln
# k8s/deploy.ps1
# k8s/deployments.yaml
# k8s/frontend.yaml
# src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
# src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
2018-03-23 12:37:12 +01:00
eiximenis
a18cec21fe
Missing aggregator project
2018-02-27 14:32:25 +01:00
eiximenis
8cfb74fe93
Fixing SPA for using aggregators
2018-02-27 13:10:39 +01:00
Eduard Tomàs
6cc87fc80a
renaming of PurchaseBff to Aggregator
2018-02-15 17:30:39 +01:00
Eduard Tomàs
02f5e1158a
Purchase BFF skeleton created
2018-01-26 17:09:36 +01:00
Unai Zorrilla Castro
025ab0e14c
Implemented HostedService in different service
2018-01-18 17:29:23 +01:00
Cesar De la Torre Llorente
08a5eeea71
Downgraded version of docker-compose files to 3.3 (instead 3.4) since VSTS agent still doesn't support it plus other versions of Docker. We'll upgrade to 3.4 soon, though. When VSTS supports it.
...
Error in VSTS:
3 error(s), 1 warning(s)
Phase 1 - 3 error(s), 1 warning(s)
Version in "/opt/vsts/work/1/s/docker-compose.yml" is unsupported. You might be seeing this error because you're using the wrong Compose file version. Either specify a supported version (e.g "2.2" or "3.3") and place your service definitions under the `services` key, or omit the `version` key and place your service definitions at the root of the file to use version 1.
For more on the Compose file format versions, see https://docs.docker.com/compose/compose-file/
/usr/local/bin/docker-compose failed with return code: 1
2018-01-09 11:01:04 -08:00
yanchenw
e4fa15b813
Optimize multi-stage build Dockerfile
...
Remove explicitly copied dependencies, copy entire solution
into the conainter and depends on the cache to reduce build
time.
Addd temporary solution file which does not contains the
dcproj file to work around the issue that the dotnet cli
cannot handle dcproj.
2018-01-04 11:01:45 -08:00
Cesar De la Torre
2137a208dd
Fixed bug in IdentityUrl for webmvc when using ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}
2017-10-31 18:21:10 -07:00
Cesar De la Torre
95ad3e1b2c
Fixed bug in docker-compose.prod.yml so it used the ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP env-var from .env file
2017-10-31 17:45:23 -07:00
Cesar De la Torre
dbc80a3596
Updates in docker-compose.prod.yml
2017-10-27 15:30:36 -07:00
Cesar De la Torre
779c7c2901
Refactoring in docker-compose files
2017-10-27 15:27:51 -07:00
Cesar De la Torre
cc4325cee5
Updated all docker-compose files version from 2.1 to 3
2017-10-08 13:24:32 -07:00
Cesar De la Torre
e8c8678082
Changed to new GA SQL Server container Image tag and parameters
2017-10-04 13:54:34 -07:00
Eduard Tomàs
93e2b9137d
Update k8s deployment and compose files with graceperiodmanager settings missing
2017-09-19 12:47:29 +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
Ramón Tomás
58f3b5b274
Removed GracePeriod microservice and added as a HostService
2017-08-23 00:10:28 +02:00
Ramón Tomás
dea392ccfa
Created Azure function deployment readme
...
Created Storage account deployment readme
Updated index readme
Update docker-compose prod files
2017-08-15 21:22:43 +02: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
Eduard Tomas
037a980623
Update environment in yaml file
2017-07-31 19:31:59 +02:00
Cesar De la Torre
73be25e6cf
Minor re-order of services in docker-compose files
2017-07-13 14:18:10 -07:00
Christian Arenas
f0f88aee98
Add PicBaseUrl with a replaced parameter
2017-07-11 12:43:06 +02:00
Cesar De la Torre
96c55b8682
Minor change in docker-compose.prod
2017-07-10 15:02:22 -07: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
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
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
