From 7b545f21cbee9717aad381fb910a43dec91138d5 Mon Sep 17 00:00:00 2001
From: Marco Pedone <m.pedone98@gmail.com>
Date: Tue, 28 Oct 2025 12:44:22 +0100
Subject: [PATCH] refactor: consolidate keydb services into
 dev-docker-compose.yml and remove redundant keydb-docker-compose.yml

---
 apps/infoalloggi/dev-docker-compose.yml   | 95 ++++++++---------------
 apps/infoalloggi/keydb-docker-compose.yml | 21 -----
 2 files changed, 33 insertions(+), 83 deletions(-)
 delete mode 100644 apps/infoalloggi/keydb-docker-compose.yml

diff --git a/apps/infoalloggi/dev-docker-compose.yml b/apps/infoalloggi/dev-docker-compose.yml
index b138325..3030922 100644
--- a/apps/infoalloggi/dev-docker-compose.yml
+++ b/apps/infoalloggi/dev-docker-compose.yml
@@ -1,66 +1,37 @@
 services:
-  web:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        INTERNAL_BASE_URL: ${INTERNAL_BASE_URL}
-        POSTGRES_USER: ${POSTGRES_USER}
-        POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-        POSTGRES_DB: ${POSTGRES_DB}
-        PGHOST: host.docker.internal
-        PGPORT: ${PGPORT}
-        BACKENDSERVER_URL: http://host.docker.internal:1323
-        TILES_URL: host.docker.internal:6379
-        KEYDB_URL: host.docker.internal:6380
-        STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY}
-        NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY}
-        STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET}
-        FIC_CLIENT_ID: ${FIC_CLIENT_ID}
-        FIC_ACCESS_TOKEN: ${FIC_ACCESS_TOKEN}
-        FIC_COMPANY_ID: ${FIC_COMPANY_ID}
-        ARUBA_USER: ${ARUBA_USER}
-        ARUBA_PASS: ${ARUBA_PASS}
-        EXP_API_USER: ${EXP_API_USER}
-        EXP_API_PASS: ${EXP_API_PASS}
-        JWT_SECRET: ${JWT_SECRET}
-        SKEBBY_USER: ${SKEBBY_USER}
-        SKEBBY_PASS: ${SKEBBY_PASS}
-    working_dir: /app
-    environment:
-      INTERNAL_BASE_URL: ${INTERNAL_BASE_URL}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: ${POSTGRES_DB}
-      PGHOST: host.docker.internal
-      PGPORT: ${PGPORT}
-      BACKENDSERVER_URL: http://host.docker.internal:1323
-      TILES_URL: host.docker.internal:6379
-      KEYDB_URL: host.docker.internal:638
-      STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY}
-      NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY}
-      STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET}
-      FIC_CLIENT_ID: ${FIC_CLIENT_ID}
-      FIC_ACCESS_TOKEN: ${FIC_ACCESS_TOKEN}
-      FIC_COMPANY_ID: ${FIC_COMPANY_ID}
-      ARUBA_USER: ${ARUBA_USER}
-      ARUBA_PASS: ${ARUBA_PASS}
-      EXP_API_USER: ${EXP_API_USER}
-      EXP_API_PASS: ${EXP_API_PASS}
-      JWT_SECRET: ${JWT_SECRET}
-      SKEBBY_USER: ${SKEBBY_USER}
-      SKEBBY_PASS: ${SKEBBY_PASS}
+  tiles:
+    image: eqalpha/keydb:latest
+    volumes:
+      - tiles-data:/data
     ports:
-      - "3000:3000"
-    networks:
-      - base
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-networks:
-  base:
-    driver: bridge
-
-
+      - "6379:6379"
+    command: keydb-server /etc/keydb/keydb.conf --maxmemory 100mb --maxmemory-policy volatile-lru --maxmemory-samples 5
+    restart: unless-stopped
+  keydb:
+    image: eqalpha/keydb:latest
+    volumes:
+      - keydb-data:/data
+    ports:
+      - "6380:6379"
 
+    restart: unless-stopped
+  storage:
+    image: "ghcr.io/marcopedone/go_fs:latest"
+    ports:
+      - "8080:8080"
+    environment:
+      PORT: 8080
+      AUTH_TOKEN: ${STORAGE_TOKEN}
+    volumes:
+      - storage_data:/app/storage
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
 
+volumes:
+  tiles-data:
+  keydb-data:
+  storage_data:
diff --git a/apps/infoalloggi/keydb-docker-compose.yml b/apps/infoalloggi/keydb-docker-compose.yml
deleted file mode 100644
index 791520a..0000000
--- a/apps/infoalloggi/keydb-docker-compose.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-services:
-  tiles:
-    image: eqalpha/keydb:latest
-    volumes:
-      - tiles-data:/data
-    ports:
-      - "6379:6379"
-    command: keydb-server /etc/keydb/keydb.conf --maxmemory 100mb --maxmemory-policy volatile-lru --maxmemory-samples 5
-    restart: unless-stopped
-  keydb:
-    image: eqalpha/keydb:latest
-    volumes:
-      - keydb-data:/data
-    ports:
-      - "6380:6379"
-
-    restart: unless-stopped
-
-volumes:
-  tiles-data:
-  keydb-data: