From 317d1a871bc9ee037f0a2bddbea3e177555d4868 Mon Sep 17 00:00:00 2001
From: Piotr Biernat <keedosn@gmail.com>
Date: Tue, 6 Dec 2022 07:36:17 +0100
Subject: [PATCH] gateway command fix

---
 deploy/egommerce-stack.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/deploy/egommerce-stack.yml b/deploy/egommerce-stack.yml
index de3c78b..aa474e5 100644
--- a/deploy/egommerce-stack.yml
+++ b/deploy/egommerce-stack.yml
@@ -3,12 +3,15 @@ version: "3.9"
 services:
   api-gateway:
     image: git.pbiernat.dev/egommerce/api-gateway:latest
+    # command:
+    #   - '--providers.consulcatalog.refreshinterval=5s' # FIXME only on config option: static/env/cli must be selected
     environment:
       - APP_NAME=api-gateway
       - APP_DOMAIN
+      - API_REGISTRY_REFRESH_INTERVAL=5s
     networks:
       - api-gateway-network
-      - api-logger-network
+      # - api-logger-network # TODO
       - identity-svc-network
       - basket-svc-network
       - catalog-svc-network
@@ -21,15 +24,19 @@ services:
     environment:
       - APP_NAME=api-registry
       - APP_DOMAIN
-    # command: "consul agent -config-dir=/consul/config"
+    volumes:
+      - registry_data:/consul/data
     networks:
       - api-registry-network
-      - api-logger-network
+      # - api-logger-network # TODO
       - api-gateway-network
       - identity-svc-network
       - basket-svc-network
       - catalog-svc-network
       - order-svc-network
+      - basket-worker-network
+      - catalog-worker-network
+      - order-worker-network
 
   api-eventbus:
     image: git.pbiernat.dev/egommerce/api-eventbus:latest
@@ -38,8 +45,8 @@ services:
       - APP_NAME=api-eventbus
       - APP_DOMAIN
     volumes:
-      - rabbitmq_data:/var/lib/rabbitmq
-      - rabbitmq_logs:/var/log/rabbitmq
+      - eventbus_data:/var/lib/rabbitmq
+      - eventbus_logs:/var/log/rabbitmq
     # labels:
     #   - "traefik.enable=true"
     #   - "traefik.tcp.routers.eventbus-svc.rule=HostSNI(`*`)"
@@ -101,6 +108,7 @@ services:
     environment:
       - APP_NAME=identity-svc
       - APP_DOMAIN
+      - APP_KV_NAMESPACE
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -116,6 +124,7 @@ services:
     environment:
       - APP_NAME=basket-svc
       - APP_DOMAIN
+      - APP_KV_NAMESPACE
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -131,6 +140,7 @@ services:
     environment:
       - APP_NAME=catalog-svc
       - APP_DOMAIN
+      - APP_KV_NAMESPACE
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -146,6 +156,7 @@ services:
     environment:
       - APP_NAME=order-svc
       - APP_DOMAIN
+      - APP_KV_NAMESPACE
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -161,6 +172,7 @@ services:
     image: git.pbiernat.dev/egommerce/basket-worker:latest
     environment:
       - APP_NAME=basket-worker
+      - APP_KV_NAMESPACE
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -202,8 +214,9 @@ services:
 volumes:
   postgres_data: ~
   mongodb_data: ~
-  rabbitmq_data: ~
-  rabbitmq_logs: ~
+  registry_data: ~
+  eventbus_data: ~
+  eventbus_logs: ~
 
 networks:
   api-gateway-network: