From 45ce3d3e3c525aee84840dfa9ce375366ea6c7f6 Mon Sep 17 00:00:00 2001
From: Piotr Biernat <keedosn@gmail.com>
Date: Fri, 2 Dec 2022 22:03:33 +0100
Subject: [PATCH] fixes

---
 deploy/egommerce-stack.dev.yml |  9 +++++----
 deploy/egommerce-stack.yml     | 13 +++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/deploy/egommerce-stack.dev.yml b/deploy/egommerce-stack.dev.yml
index c103ebb..a7753ae 100644
--- a/deploy/egommerce-stack.dev.yml
+++ b/deploy/egommerce-stack.dev.yml
@@ -14,6 +14,7 @@ services:
       - ./certs:/etc/traefik/certs
 
   api-registry:
+    image: git.pbiernat.dev/egommerce/api-registry:dev
     hostname: registry.egommerce.local
     environment:
       - APP_DOMAIN=registry.egommerce.local
@@ -27,6 +28,7 @@ services:
     hostname: eventbus.egommerce.local
     environment:
       - APP_DOMAIN=eventbus.egommerce.local
+      - RABBITMQ_NODENAME=api-eventbus
       # - RABBITMQ_DEFAULT_USER = admin
       # - RABBITMQ_DEFAULT_PASS = passw123
     ports:
@@ -64,7 +66,6 @@ services:
   # API micro-services
   identity-svc:
     image: git.pbiernat.dev/egommerce/identity-svc:dev
-    # hostname: identity.api.egommerce.local
     environment:
       - APP_DOMAIN=identity.api.egommerce.local
       - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
@@ -75,7 +76,6 @@ services:
 
   basket-svc:
     image: git.pbiernat.dev/egommerce/basket-svc:dev
-    # hostname: basket.api.egommerce.local
     environment:
       - APP_DOMAIN=basket.api.egommerce.local
       - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
@@ -86,7 +86,6 @@ services:
 
   catalog-svc:
     image: git.pbiernat.dev/egommerce/catalog-svc:dev
-    # hostname: catalog.api.egommerce.local
     environment:
       - APP_DOMAIN=catalog.api.egommerce.local
       - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
@@ -97,7 +96,6 @@ services:
 
   order-svc:
     image: git.pbiernat.dev/egommerce/order-svc:dev
-    # hostname: order.api.egommerce.local
     environment:
       - APP_DOMAIN=order.api.egommerce.local
       - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
@@ -113,6 +111,7 @@ services:
       replicas: 2
     environment:
       - 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
 
   catalog-worker:
@@ -121,6 +120,7 @@ services:
       replicas: 2
     environment:
       - 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
 
   order-worker:
@@ -129,4 +129,5 @@ services:
       replicas: 2
     environment:
       - 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
diff --git a/deploy/egommerce-stack.yml b/deploy/egommerce-stack.yml
index 03f8ceb..de3c78b 100644
--- a/deploy/egommerce-stack.yml
+++ b/deploy/egommerce-stack.yml
@@ -17,13 +17,11 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
 
   api-registry:
-    image: hashicorp/consul:1.14
+    image: git.pbiernat.dev/egommerce/api-registry:latest
     environment:
       - APP_NAME=api-registry
       - APP_DOMAIN
-    volumes:
-     - ./etc/consul/server.json:/consul/config/server.json:ro
-    command: "consul agent -config-dir=/consul/config"
+    # command: "consul agent -config-dir=/consul/config"
     networks:
       - api-registry-network
       - api-logger-network
@@ -104,6 +102,7 @@ services:
       - APP_NAME=identity-svc
       - APP_DOMAIN
       - DATABASE_URL
+      - MONGODB_URL
       - EVENTBUS_URL
     networks:
       - identity-svc-network
@@ -118,6 +117,7 @@ services:
       - APP_NAME=basket-svc
       - APP_DOMAIN
       - DATABASE_URL
+      - MONGODB_URL
       - EVENTBUS_URL
     networks:
       - basket-svc-network
@@ -132,6 +132,7 @@ services:
       - APP_NAME=catalog-svc
       - APP_DOMAIN
       - DATABASE_URL
+      - MONGODB_URL
       - EVENTBUS_URL
     networks:
       - catalog-svc-network
@@ -146,6 +147,7 @@ services:
       - APP_NAME=order-svc
       - APP_DOMAIN
       - DATABASE_URL
+      - MONGODB_URL
       - EVENTBUS_URL
     networks:
       - order-svc-network
@@ -160,6 +162,7 @@ services:
     environment:
       - APP_NAME=basket-worker
       - DATABASE_URL
+      - MONGODB_URL
       - EVENTBUS_URL
     networks:
       - basket-worker-network
@@ -173,6 +176,7 @@ services:
     environment:
       - APP_NAME=catalog-worker
       - DATABASE_URL
+      - MONGODB_URL
       - EVENTBUS_URL
     networks:
       - catalog-worker-network
@@ -186,6 +190,7 @@ services:
     environment:
       - APP_NAME=order-worker
       - DATABASE_URL
+      - MONGODB_URL
       - EVENTBUS_URL
     networks:
       - order-worker-network