Skip to content

Commit

Permalink
Moved some files to ./src/
Browse files Browse the repository at this point in the history
  • Loading branch information
eiximenis committed Aug 28, 2019
1 parent 67af71d commit 11fe3fc
Show file tree
Hide file tree
Showing 14 changed files with 81 additions and 81 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 10 additions & 10 deletions docker-compose-tests.yml → src/docker-compose-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ services:
image: ${REGISTRY:-eshop}/identity-api-test:${TAG:-latest}
build:
context: .
dockerfile: src/Services/Identity/Identity.API/Dockerfile
dockerfile: Services/Identity/Identity.API/Dockerfile
depends_on:
- sql-data-test

basket-api-test:
image: ${REGISTRY:-eshop}/basket-api-test:${TAG:-latest}
build:
context: .
dockerfile: src/Services/Basket/Basket.API/Dockerfile
dockerfile: Services/Basket/Basket.API/Dockerfile
target: functionaltest
depends_on:
- basket-data-test
Expand All @@ -38,7 +38,7 @@ services:
image: ${REGISTRY:-eshop}/basket-api-test:${TAG:-latest}
build:
context: .
dockerfile: src/Services/Basket/Basket.API/Dockerfile
dockerfile: Services/Basket/Basket.API/Dockerfile
target: unittest
depends_on:
- basket-data-test
Expand All @@ -51,7 +51,7 @@ services:
image: ${REGISTRY:-eshop}/catalog-api-test:${TAG:-latest}
build:
context: .
dockerfile: src/Services/Catalog/Catalog.API/Dockerfile
dockerfile: Services/Catalog/Catalog.API/Dockerfile
target: functionaltest
depends_on:
- sql-data-test
Expand All @@ -63,7 +63,7 @@ services:
image: ${REGISTRY:-eshop}/catalog-api-test:${TAG:-latest}
build:
context: .
dockerfile: src/Services/Catalog/Catalog.API/Dockerfile
dockerfile: Services/Catalog/Catalog.API/Dockerfile
target: unittest
depends_on:
- sql-data-test
Expand All @@ -75,7 +75,7 @@ services:
image: ${REGISTRY:-eshop}/ordering-api-test:${TAG:-latest}
build:
context: .
dockerfile: src/Services/Ordering/Ordering.API/Dockerfile
dockerfile: Services/Ordering/Ordering.API/Dockerfile
target: functionaltest
depends_on:
- sql-data-test
Expand All @@ -87,7 +87,7 @@ services:
image: ${REGISTRY:-eshop}/ordering-api-test:${TAG:-latest}
build:
context: .
dockerfile: src/Services/Ordering/Ordering.API/Dockerfile
dockerfile: Services/Ordering/Ordering.API/Dockerfile
target: unittest
depends_on:
- sql-data-test
Expand All @@ -99,7 +99,7 @@ services:
image: ${REGISTRY:-eshop}/marketing-api-test:${TAG:-latest}
build:
context: .
dockerfile: src/Services/Marketing/Marketing.API/Dockerfile
dockerfile: Services/Marketing/Marketing.API/Dockerfile
target: functionaltest
depends_on:
- sql-data-test
Expand All @@ -113,15 +113,15 @@ services:
image: ${REGISTRY:-eshop}/payment-api-test:${TAG:-latest}
build:
context: .
dockerfile: src/Services/Payment/Payment.API/Dockerfile
dockerfile: Services/Payment/Payment.API/Dockerfile
depends_on:
- rabbitmq-test

locations-api-test:
image: ${REGISTRY:-eshop}/locations-api-test:${TAG:-latest}
build:
context: .
dockerfile: src/Services/Location/Locations.API/Dockerfile
dockerfile: Services/Location/Locations.API/Dockerfile
target: functionaltest
depends_on:
- nosql-data-test
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions docker-compose.override.yml → src/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ services:
ports:
- "5200:80"
volumes:
- ./src/ApiGateways/Mobile.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
- ./ApiGateways/Mobile.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}

mobilemarketingapigw:
environment:
Expand All @@ -242,7 +242,7 @@ services:
ports:
- "5201:80"
volumes:
- ./src/ApiGateways/Mobile.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
- ./ApiGateways/Mobile.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}

webshoppingapigw:
environment:
Expand All @@ -259,7 +259,7 @@ services:
ports:
- "5202:80"
volumes:
- ./src/ApiGateways/Web.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
- ./ApiGateways/Web.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}

webmarketingapigw:
environment:
Expand All @@ -276,7 +276,7 @@ services:
ports:
- "5203:80"
volumes:
- ./src/ApiGateways/Web.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
- ./ApiGateways/Web.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}

mobileshoppingagg:
environment:
Expand Down Expand Up @@ -424,6 +424,6 @@ services:

envoy:
volumes:
- ./src/ApiGateways/Envoy/config:/etc/envoy
- ./ApiGateways/Envoy/config:/etc/envoy
ports:
- "51051:51051"
8 changes: 4 additions & 4 deletions docker-compose.prod.yml → src/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ services:
- "5200:80" # Important: In a production environment your should remove the external port (5200) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
volumes:
- ./src/ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration
- ./ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration

mobilemarketingapigw:
environment:
Expand All @@ -259,7 +259,7 @@ services:
- "5201:80" # Important: In a production environment your should remove the external port (5201) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
volumes:
- ./src/ApiGateways/Mobile.Bff.Marketing/apigw:/app/configuration
- ./ApiGateways/Mobile.Bff.Marketing/apigw:/app/configuration

webshoppingapigw:
environment:
Expand All @@ -269,7 +269,7 @@ services:
- "5202:80" # Important: In a production environment your should remove the external port (5202) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
volumes:
- ./src/ApiGateways/Web.Bff.Shopping/apigw:/app/configuration
- ./ApiGateways/Web.Bff.Shopping/apigw:/app/configuration

webmarketingapigw:
environment:
Expand All @@ -279,7 +279,7 @@ services:
- "5203:80" # Important: In a production environment your should remove the external port (5203) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
volumes:
- ./src/ApiGateways/Web.Bff.Marketing/apigw:/app/configuration
- ./ApiGateways/Web.Bff.Marketing/apigw:/app/configuration

mobileshoppingagg:
environment:
Expand Down
File renamed without changes.
40 changes: 20 additions & 20 deletions docker-compose.yml → src/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ services:
image: ${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Identity/Identity.API/Dockerfile
dockerfile: Services/Identity/Identity.API/Dockerfile
depends_on:
- sql.data

basket.api:
image: ${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Basket/Basket.API/Dockerfile
dockerfile: Services/Basket/Basket.API/Dockerfile
depends_on:
- basket.data
- identity.api
Expand All @@ -39,7 +39,7 @@ services:
image: ${REGISTRY:-eshop}/catalog.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Catalog/Catalog.API/Dockerfile
dockerfile: Services/Catalog/Catalog.API/Dockerfile
depends_on:
- sql.data
- rabbitmq
Expand All @@ -48,7 +48,7 @@ services:
image: ${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Ordering/Ordering.API/Dockerfile
dockerfile: Services/Ordering/Ordering.API/Dockerfile
depends_on:
- sql.data
- rabbitmq
Expand All @@ -57,7 +57,7 @@ services:
image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
dockerfile: Services/Ordering/Ordering.BackgroundTasks/Dockerfile
depends_on:
- sql.data
- rabbitmq
Expand All @@ -66,7 +66,7 @@ services:
image: ${REGISTRY:-eshop}/marketing.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Marketing/Marketing.API/Dockerfile
dockerfile: Services/Marketing/Marketing.API/Dockerfile
depends_on:
- sql.data
- nosql.data
Expand All @@ -77,15 +77,15 @@ services:
image: ${REGISTRY:-eshop}/payment.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Payment/Payment.API/Dockerfile
dockerfile: Services/Payment/Payment.API/Dockerfile
depends_on:
- rabbitmq

locations.api:
image: ${REGISTRY:-eshop}/locations.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Location/Locations.API/Dockerfile
dockerfile: Services/Location/Locations.API/Dockerfile
depends_on:
- nosql.data
- rabbitmq
Expand All @@ -94,15 +94,15 @@ services:
image: ${REGISTRY:-eshop}/webhooks.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Webhooks/Webhooks.API/Dockerfile
dockerfile: Services/Webhooks/Webhooks.API/Dockerfile
depends_on:
- sql.data

mobileshoppingapigw:
image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
dockerfile: ApiGateways/ApiGw-Base/Dockerfile
depends_on:
- nosql.data
- sql.data
Expand All @@ -117,7 +117,7 @@ services:
image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
dockerfile: ApiGateways/ApiGw-Base/Dockerfile
depends_on:
- nosql.data
- sql.data
Expand All @@ -132,7 +132,7 @@ services:
image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
dockerfile: ApiGateways/ApiGw-Base/Dockerfile
depends_on:
- nosql.data
- sql.data
Expand All @@ -147,7 +147,7 @@ services:
image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
dockerfile: ApiGateways/ApiGw-Base/Dockerfile
depends_on:
- nosql.data
- sql.data
Expand All @@ -162,7 +162,7 @@ services:
image: ${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
dockerfile: ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
depends_on:
- nosql.data
- sql.data
Expand All @@ -177,7 +177,7 @@ services:
image: ${REGISTRY:-eshop}/webshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
dockerfile: ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
depends_on:
- nosql.data
- sql.data
Expand All @@ -192,7 +192,7 @@ services:
image: ${REGISTRY:-eshop}/ordering.signalrhub:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Ordering/Ordering.SignalrHub/Dockerfile
dockerfile: Services/Ordering/Ordering.SignalrHub/Dockerfile
depends_on:
- nosql.data
- sql.data
Expand All @@ -207,13 +207,13 @@ services:
image: ${REGISTRY:-eshop}/webstatus:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Web/WebStatus/Dockerfile
dockerfile: Web/WebStatus/Dockerfile

webspa:
image: ${REGISTRY:-eshop}/webspa:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Web/WebSPA/Dockerfile
dockerfile: Web/WebSPA/Dockerfile
args:
NODE_IMAGE: ${NODE_IMAGE:-node:8.11}
# depends_on:
Expand All @@ -225,7 +225,7 @@ services:
image: ${REGISTRY:-eshop}/webmvc:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Web/WebMVC/Dockerfile
dockerfile: Web/WebMVC/Dockerfile
depends_on:
- webshoppingagg
- webshoppingapigw
Expand All @@ -235,7 +235,7 @@ services:
image: ${REGISTRY:-eshop}/webhooks.client:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Web/WebhookClient/Dockerfile
dockerfile: Web/WebhookClient/Dockerfile
depends_on:
- webhooks.api

Expand Down
Loading

0 comments on commit 11fe3fc

Please sign in to comment.