ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix services test containers

Browse Source
This commit is contained in:
Miguel Veloso 2019-12-02 20:27:01 +00:00
parent ae8130c83f
commit a9fc1e2c8d
2 changed files with 19 additions and 19 deletions

20
src/docker-compose-tests.override.yml

@ -41,7 +41,7 @@ services:
ports: ports:
- "5105:80" - "5105:80"
basket-api-test: basket-api-functional-test:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
@ -61,7 +61,7 @@ services:
- dotnet - dotnet
- test - test
- --logger - --logger
- trx;LogFileName=/tests/basket-test-results.xml - trx;LogFileName=/tests/basket-functional-test-results.xml
basket-api-unit-test: basket-api-unit-test:
environment: environment:
@ -85,7 +85,7 @@ services:
- --logger - --logger
- trx;LogFileName=/tests/basket-unit-test-results.xml - trx;LogFileName=/tests/basket-unit-test-results.xml
catalog-api-test: catalog-api-functional-test:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
@ -107,7 +107,7 @@ services:
- dotnet - dotnet
- test - test
- --logger - --logger
- trx;LogFileName=/tests/catalog-test-results.xml - trx;LogFileName=/tests/catalog-functional-test-results.xml
catalog-api-unit-test: catalog-api-unit-test:
environment: environment:
@ -133,7 +133,7 @@ services:
- --logger - --logger
- trx;LogFileName=/tests/catalog-unit-test-results.xml - trx;LogFileName=/tests/catalog-unit-test-results.xml
ordering-api-test: ordering-api-functional-test:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
@ -155,7 +155,7 @@ services:
- dotnet - dotnet
- test - test
- --logger - --logger
- trx;LogFileName=/tests/ordering-test-results.xml - trx;LogFileName=/tests/ordering-functional-test-results.xml
ordering-api-unit-test: ordering-api-unit-test:
environment: environment:
@ -181,7 +181,7 @@ services:
- --logger - --logger
- trx;LogFileName=/tests/ordering-unit-test-results.xml - trx;LogFileName=/tests/ordering-unit-test-results.xml
marketing-api-test: marketing-api-functional-test:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
@ -208,7 +208,7 @@ services:
- dotnet - dotnet
- test - test
- --logger - --logger
- trx;LogFileName=/tests/marketing-test-results.xml - trx;LogFileName=/tests/marketing-functional-test-results.xml
payment-api-test: payment-api-test:
environment: environment:
@ -223,7 +223,7 @@ services:
ports: ports:
- "5108:80" - "5108:80"
locations-api-test: locations-api-functional-test:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
@ -244,4 +244,4 @@ services:
- dotnet - dotnet
- test - test
- --logger - --logger
- trx;LogFileName=/tests/locations-test-results.xml - trx;LogFileName=/tests/locations-functional-test-results.xml

18
src/docker-compose-tests.yml

@ -21,7 +21,7 @@ services:
depends_on: depends_on:
- sql-data-test - sql-data-test
basket-api-test: basket-api-functional-test:
image: ${REGISTRY:-eshop}/basket-api-test:${TAG:-latest} image: ${REGISTRY:-eshop}/basket-api-test:${TAG:-latest}
build: build:
context: . context: .
@ -35,7 +35,7 @@ services:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
basket-api-unit-test: basket-api-unit-test:
image: ${REGISTRY:-eshop}/basket-api-test:${TAG:-latest} image: ${REGISTRY:-eshop}/basket-api-unit-test:${TAG:-latest}
build: build:
context: . context: .
dockerfile: Services/Basket/Basket.API/Dockerfile dockerfile: Services/Basket/Basket.API/Dockerfile
@ -47,8 +47,8 @@ services:
volumes: volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
catalog-api-test: catalog-api-functional-test:
image: ${REGISTRY:-eshop}/catalog-api-test:${TAG:-latest} image: ${REGISTRY:-eshop}/catalog-api-functional-test:${TAG:-latest}
build: build:
context: . context: .
dockerfile: Services/Catalog/Catalog.API/Dockerfile dockerfile: Services/Catalog/Catalog.API/Dockerfile
@ -60,7 +60,7 @@ services:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
catalog-api-unit-test: catalog-api-unit-test:
image: ${REGISTRY:-eshop}/catalog-api-test:${TAG:-latest} image: ${REGISTRY:-eshop}/catalog-api-unit-test:${TAG:-latest}
build: build:
context: . context: .
dockerfile: Services/Catalog/Catalog.API/Dockerfile dockerfile: Services/Catalog/Catalog.API/Dockerfile
@ -71,7 +71,7 @@ services:
volumes: volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
ordering-api-test: ordering-api-functional-test:
image: ${REGISTRY:-eshop}/ordering-api-test:${TAG:-latest} image: ${REGISTRY:-eshop}/ordering-api-test:${TAG:-latest}
build: build:
context: . context: .
@ -84,7 +84,7 @@ services:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
ordering-api-unit-test: ordering-api-unit-test:
image: ${REGISTRY:-eshop}/ordering-api-test:${TAG:-latest} image: ${REGISTRY:-eshop}/ordering-api-unit-test:${TAG:-latest}
build: build:
context: . context: .
dockerfile: Services/Ordering/Ordering.API/Dockerfile dockerfile: Services/Ordering/Ordering.API/Dockerfile
@ -95,7 +95,7 @@ services:
volumes: volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
marketing-api-test: marketing-api-functional-test:
image: ${REGISTRY:-eshop}/marketing-api-test:${TAG:-latest} image: ${REGISTRY:-eshop}/marketing-api-test:${TAG:-latest}
build: build:
context: . context: .
@ -117,7 +117,7 @@ services:
depends_on: depends_on:
- rabbitmq-test - rabbitmq-test
locations-api-test: locations-api-functional-test:
image: ${REGISTRY:-eshop}/locations-api-test:${TAG:-latest} image: ${REGISTRY:-eshop}/locations-api-test:${TAG:-latest}
build: build:
context: . context: .