egommerce/stack
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Piotr Biernat 2022-12-02 22:03:33 +01:00
parent f9bf711ef6
commit 45ce3d3e3c
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deploy/egommerce-stack.dev.yml
View File

@ -14,6 +14,7 @@ services:
- ./certs:/etc/traefik/certs - ./certs:/etc/traefik/certs
api-registry: api-registry:
image: git.pbiernat.dev/egommerce/api-registry:dev
hostname: registry.egommerce.local hostname: registry.egommerce.local
environment: environment:
- APP_DOMAIN=registry.egommerce.local - APP_DOMAIN=registry.egommerce.local
@ -27,6 +28,7 @@ services:
hostname: eventbus.egommerce.local hostname: eventbus.egommerce.local
environment: environment:
- APP_DOMAIN=eventbus.egommerce.local - APP_DOMAIN=eventbus.egommerce.local
- RABBITMQ_NODENAME=api-eventbus
# - RABBITMQ_DEFAULT_USER = admin # - RABBITMQ_DEFAULT_USER = admin
# - RABBITMQ_DEFAULT_PASS = passw123 # - RABBITMQ_DEFAULT_PASS = passw123
ports: ports:
@ -64,7 +66,6 @@ services:
# API micro-services # API micro-services
identity-svc: identity-svc:
image: git.pbiernat.dev/egommerce/identity-svc:dev image: git.pbiernat.dev/egommerce/identity-svc:dev
# hostname: identity.api.egommerce.local
environment: environment:
- APP_DOMAIN=identity.api.egommerce.local - APP_DOMAIN=identity.api.egommerce.local
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
@ -75,7 +76,6 @@ services:
basket-svc: basket-svc:
image: git.pbiernat.dev/egommerce/basket-svc:dev image: git.pbiernat.dev/egommerce/basket-svc:dev
# hostname: basket.api.egommerce.local
environment: environment:
- APP_DOMAIN=basket.api.egommerce.local - APP_DOMAIN=basket.api.egommerce.local
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
@ -86,7 +86,6 @@ services:
catalog-svc: catalog-svc:
image: git.pbiernat.dev/egommerce/catalog-svc:dev image: git.pbiernat.dev/egommerce/catalog-svc:dev
# hostname: catalog.api.egommerce.local
environment: environment:
- APP_DOMAIN=catalog.api.egommerce.local - APP_DOMAIN=catalog.api.egommerce.local
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
@ -97,7 +96,6 @@ services:
order-svc: order-svc:
image: git.pbiernat.dev/egommerce/order-svc:dev image: git.pbiernat.dev/egommerce/order-svc:dev
# hostname: order.api.egommerce.local
environment: environment:
- APP_DOMAIN=order.api.egommerce.local - APP_DOMAIN=order.api.egommerce.local
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
@ -113,6 +111,7 @@ services:
replicas: 2 replicas: 2
environment: environment:
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.local:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672 - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672
catalog-worker: catalog-worker:
@ -121,6 +120,7 @@ services:
replicas: 2 replicas: 2
environment: environment:
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.local:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672 - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672
order-worker: order-worker:
@ -129,4 +129,5 @@ services:
replicas: 2 replicas: 2
environment: environment:
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.local:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672 - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672

13
deploy/egommerce-stack.yml
View File

@ -17,13 +17,11 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
api-registry: api-registry:
image: hashicorp/consul:1.14 image: git.pbiernat.dev/egommerce/api-registry:latest
environment: environment:
- APP_NAME=api-registry - APP_NAME=api-registry
- APP_DOMAIN - APP_DOMAIN
volumes: # command: "consul agent -config-dir=/consul/config"
- ./etc/consul/server.json:/consul/config/server.json:ro
command: "consul agent -config-dir=/consul/config"
networks: networks:
- api-registry-network - api-registry-network
- api-logger-network - api-logger-network
@ -104,6 +102,7 @@ services:
- APP_NAME=identity-svc - APP_NAME=identity-svc
- APP_DOMAIN - APP_DOMAIN
- DATABASE_URL - DATABASE_URL
- MONGODB_URL
- EVENTBUS_URL - EVENTBUS_URL
networks: networks:
- identity-svc-network - identity-svc-network
@ -118,6 +117,7 @@ services:
- APP_NAME=basket-svc - APP_NAME=basket-svc
- APP_DOMAIN - APP_DOMAIN
- DATABASE_URL - DATABASE_URL
- MONGODB_URL
- EVENTBUS_URL - EVENTBUS_URL
networks: networks:
- basket-svc-network - basket-svc-network
@ -132,6 +132,7 @@ services:
- APP_NAME=catalog-svc - APP_NAME=catalog-svc
- APP_DOMAIN - APP_DOMAIN
- DATABASE_URL - DATABASE_URL
- MONGODB_URL
- EVENTBUS_URL - EVENTBUS_URL
networks: networks:
- catalog-svc-network - catalog-svc-network
@ -146,6 +147,7 @@ services:
- APP_NAME=order-svc - APP_NAME=order-svc
- APP_DOMAIN - APP_DOMAIN
- DATABASE_URL - DATABASE_URL
- MONGODB_URL
- EVENTBUS_URL - EVENTBUS_URL
networks: networks:
- order-svc-network - order-svc-network
@ -160,6 +162,7 @@ services:
environment: environment:
- APP_NAME=basket-worker - APP_NAME=basket-worker
- DATABASE_URL - DATABASE_URL
- MONGODB_URL
- EVENTBUS_URL - EVENTBUS_URL
networks: networks:
- basket-worker-network - basket-worker-network
@ -173,6 +176,7 @@ services:
environment: environment:
- APP_NAME=catalog-worker - APP_NAME=catalog-worker
- DATABASE_URL - DATABASE_URL
- MONGODB_URL
- EVENTBUS_URL - EVENTBUS_URL
networks: networks:
- catalog-worker-network - catalog-worker-network
@ -186,6 +190,7 @@ services:
environment: environment:
- APP_NAME=order-worker - APP_NAME=order-worker
- DATABASE_URL - DATABASE_URL
- MONGODB_URL
- EVENTBUS_URL - EVENTBUS_URL
networks: networks:
- order-worker-network - order-worker-network