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
Cesar De la Torre Llorente
1a4205491b
Setting SA_PASSWORD for the SQL Server Linux container config instead MSSQL__SA_PASSWORD, so it could be compatible for SQL Server on Windows Containers, too.
2018-01-09 10:02:29 -08:00
Cesar De la Torre Llorente
bc619b8c4b
Fixed issue with SQL container config for Linux container instead Windows Container config in docker-compose.override.yml
2018-01-09 09:35:41 -08:00
Cesar De la Torre Llorente
14da2c3885
Fixed SQL pwd in docker-compose for Linux
2018-01-09 09:23:47 -08:00
Cesar De la Torre
60fc141792
Fixed SQL parameters for the new SQL Server image
2018-01-05 12:38:03 -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
f096624238
Updated comment with config for Mac
2018-01-03 11:15:26 -08:00
Cesar De la Torre
779c7c2901
Refactoring in docker-compose files
2017-10-27 15:27:51 -07:00
Ramón Tomás
c51c101f90
Updated Load Tests
...
Added middleware to bypass authorization in load testing
2017-10-23 17:39:45 +02:00
Igor Sychev
9827483b7b
Payment API orchestrator fix
2017-10-12 21:33:18 +01:00
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
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
Ramón Tomás
99dd90e699
Merge Dev
2017-10-02 15:04:25 +02:00
Ramón Tomás
0f12640725
Fix issue k8s webstatus: webmvc healthcheck fails
...
Added Payment.api to healthcheck
2017-09-29 11:45:25 +02: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
79d045f897
Merge pull request #320 from SychevIgor/SychevIgor/PaymntHealthCheck
...
payment API require health check
2017-09-18 16:11:26 -07:00
Igor Sychev
926cc9f5e5
Health check for Payment
2017-09-18 09:15:53 +03:00
Igor Sychev
29b3811eea
Grace period rudement fix
2017-09-18 09:15:18 +03:00
Ramón Tomás
480723e351
Merge branch 'dev' into eShopOnServiceFabric-Win
2017-09-15 14:21:23 +02:00
Ramón Tomás
cecdc40ac1
Fix Authentication issue in Locations.api
...
Created input in user campaigns view to update the user's location
2017-09-15 13:54:48 +02:00
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
