From d9b6d522aefb8d3cacd14970f5d7d8577798970f Mon Sep 17 00:00:00 2001
From: _DiSay <75474520+DiSay1@users.noreply.github.com>
Date: Sun, 31 Aug 2025 15:09:31 +0200
Subject: [PATCH 1/2] chore: add a unified Docker network for all Huly services
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, each service was relying on the default Docker Compose network.
As a result, cross-container communication (e.g., transactor → redpanda)
failed, causing KafkaJS connection timeouts and WebSocket session errors.

This commit introduces a shared network 'huly_net' and attaches all services
to it, allowing reliable service discovery by container names.

The Docker and Docker Compose versions mentioned below are the versions used
in the current working environment:

- Docker version: 28.3.3
- Docker Compose version: v2.39.1

Changes:
- All services now use network: huly_net
- Network is defined at the bottom of the Compose file
- Container names remain unchanged
- Healthchecks and ports are untouched


Signed-off-by: _DiSay <75474520+DiSay1@users.noreply.github.com>
---
 compose.yml | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 866de42..d094da5 100644
--- a/compose.yml
+++ b/compose.yml
@@ -7,6 +7,8 @@ services:
     volumes:
       - ./.huly.nginx:/etc/nginx/conf.d/default.conf
     restart: unless-stopped
+    networks:
+      - huly_net
 
   cockroach:
     image: cockroachdb/cockroach:latest-v24.2
@@ -19,6 +21,8 @@ services:
       - ${VOLUME_CR_DATA_PATH:-cr_data}:/cockroach/cockroach-data
       - ${VOLUME_CR_CERTS_PATH:-cr_certs}:/cockroach/certs
     restart: unless-stopped
+    networks:
+      - huly_net
 
   redpanda:
     image: docker.redpanda.com/redpandadata/redpanda:v24.3.6
@@ -46,6 +50,8 @@ services:
       interval: 10s
       timeout: 5s
       retries: 10
+    networks:
+      - huly_net
 
   minio:
     image: "minio/minio"
@@ -57,6 +63,8 @@ services:
       interval: 5s
       retries: 10
     restart: unless-stopped
+    networks:
+      - huly_net
 
   elastic:
     image: "elasticsearch:7.14.2"
@@ -77,6 +85,8 @@ services:
       retries: 10
       test: curl -s http://localhost:9200/_cluster/health | grep -vq '"status":"red"'
     restart: unless-stopped
+    networks:
+      - huly_net
 
   rekoni:
     image: hardcoreeng/rekoni-service:${HULY_VERSION}
@@ -87,6 +97,8 @@ services:
         limits:
           memory: 500M
     restart: unless-stopped
+    networks:
+      - huly_net
 
   transactor:
     image: hardcoreeng/transactor:${HULY_VERSION}
@@ -102,6 +114,8 @@ services:
       - LAST_NAME_FIRST=${LAST_NAME_FIRST:-true}
       - QUEUE_CONFIG=redpanda:9092
     restart: unless-stopped
+    networks:
+      - huly_net
 
   collaborator:
     image: hardcoreeng/collaborator:${HULY_VERSION}
@@ -112,6 +126,8 @@ services:
       - STATS_URL=http://stats:4900
       - STORAGE_CONFIG=datalake|http://datalake:4030
     restart: unless-stopped
+    networks:
+      - huly_net
 
   account:
     image: hardcoreeng/account:${HULY_VERSION}
@@ -128,6 +144,8 @@ services:
       - ACCOUNT_PORT=3000
       - QUEUE_CONFIG=redpanda:9092
     restart: unless-stopped
+    networks:
+      - huly_net
 
   workspace:
     image: hardcoreeng/workspace:${HULY_VERSION}
@@ -141,6 +159,8 @@ services:
       - STATS_URL=http://stats:4900
       - QUEUE_CONFIG=redpanda:9092
     restart: unless-stopped
+    networks:
+      - huly_net
 
   front:
     image: hardcoreeng/front:${HULY_VERSION}
@@ -166,6 +186,8 @@ services:
       - LAST_NAME_FIRST=${LAST_NAME_FIRST:-true}
       - DESKTOP_UPDATES_CHANNEL=${HULY_VERSION}
     restart: unless-stopped
+    networks:
+      - huly_net
 
   fulltext:
     image: hardcoreeng/fulltext:${HULY_VERSION}
@@ -180,6 +202,8 @@ services:
       - STATS_URL=http://stats:4900
       - QUEUE_CONFIG=redpanda:9092
     restart: unless-stopped
+    networks:
+      - huly_net
 
   stats:
     image: hardcoreeng/stats:${HULY_VERSION}
@@ -187,6 +211,8 @@ services:
       - PORT=4900
       - SERVER_SECRET=${SECRET}
     restart: unless-stopped
+    networks:
+      - huly_net
 
   datalake:
     image: hardcoreeng/datalake:${HULY_VERSION}
@@ -208,6 +234,9 @@ services:
       - BUCKETS=huly,eu|http://minio:9000?accessKey=minioadmin&secretKey=minioadmin
       - QUEUE_CONFIG=redpanda:9092
     restart: unless-stopped
+    networks:
+      - huly_net
+
 volumes:
   # These named volumes are used when custom volume paths are not specified
   # If VOLUME_*_PATH variables are set, these volumes will be ignored
@@ -215,4 +244,7 @@ volumes:
   files:
   cr_data:
   cr_certs:
-  redpanda:
\ No newline at end of file
+  redpanda:
+
+networks:
+  huly_net:

From d86f94c66487005573b52fcd8ee7f2ff33a11581 Mon Sep 17 00:00:00 2001
From: _DiSay <75474520+DiSay1@users.noreply.github.com>
Date: Wed, 17 Sep 2025 20:11:15 +0200
Subject: [PATCH 2/2] Update compose.yml

Signed-off-by: _DiSay <75474520+DiSay1@users.noreply.github.com>
---
 compose.yml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/compose.yml b/compose.yml
index 398eaf6..4aa0cc1 100644
--- a/compose.yml
+++ b/compose.yml
@@ -212,29 +212,6 @@ services:
     restart: unless-stopped
     networks:
       - huly_net
-
-  datalake:
-    image: hardcoreeng/datalake:${HULY_VERSION}
-    depends_on:
-      minio:
-        condition: service_healthy
-      cockroach:
-        condition: service_started
-      stats:
-        condition: service_started
-      account:
-        condition: service_started
-    environment:
-      - PORT=4030
-      - SECRET=${SECRET}
-      - ACCOUNTS_URL=http://account:3000
-      - STATS_URL=http://stats:4900
-      - DB_URL=${CR_DB_URL}
-      - BUCKETS=huly,eu|http://minio:9000?accessKey=minioadmin&secretKey=minioadmin
-      - QUEUE_CONFIG=redpanda:9092
-    restart: unless-stopped
-    networks:
-      - huly_net
       
 volumes:
   # These named volumes are used when custom volume paths are not specified