From 43b25a1dde36c5b4b7853acf3a43da32e7e5d192 Mon Sep 17 00:00:00 2001
From: Vano Devium <webdevium@gmail.com>
Date: Wed, 21 May 2025 13:06:07 +0300
Subject: [PATCH] docker-compose-optimization

---
 .env               | 13 ---------
 .env.example       |  8 ++++++
 .gitignore         |  1 +
 docker-compose.yml | 72 ++++++++++++++++++++++++----------------------
 4 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 .env
 create mode 100644 .env.example
 create mode 100644 .gitignore

diff --git a/.env b/.env
deleted file mode 100644
index bf26b7f..0000000
--- a/.env
+++ /dev/null
@@ -1,13 +0,0 @@
-BACKEND_SERVICE_CONTAINER_NAME="logforge-backend"
-BACKEND_SERVICE_PORT="8000"
-EXPOSED_BACKEND_PORT="8000"
-
-FRONTEND_SERVICE_CONTAINER_NAME="logforge-frontend"
-FRONTEND_SERVICE_PORT="3000"
-EXPOSED_FRONTEND_PORT="3000"
-
-NOTIFIER_SERVICE_CONTAINER="logforge-notifier"
-NOTIFIER_PLAIN_PORT="8083"
-NOTIFIER_WEB_PORT="8086"
-
-AUTOUPDATE_SERVICE_NAME="logforge-autoupdate"
diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..95c7652
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,8 @@
+BACKEND_SERVICE_PORT=8000
+EXPOSED_BACKEND_PORT=8000
+
+FRONTEND_SERVICE_PORT=3000
+EXPOSED_FRONTEND_PORT=3000
+
+NOTIFIER_PLAIN_PORT=8083
+NOTIFIER_WEB_PORT=8086
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4c49bd7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.env
diff --git a/docker-compose.yml b/docker-compose.yml
index b142420..ceb6c73 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,64 +1,68 @@
-version: "3.9"
+name: "logforge"
 
 services:
-  logforge-backend:
-    image: madanb13/logforge-backend:latest
-    container_name: ${BACKEND_SERVICE_CONTAINER_NAME:-logforge-backend}
+
+  backend:
+    image: "madanb13/logforge-backend:latest"
+    restart: unless-stopped
     environment:
+      NOTIFIER_SERVICE_CONTAINER_NAME: "notifier"
       PORT: "${BACKEND_SERVICE_PORT:-8000}"
-      NOTIFIER_SERVICE_CONTAINER_NAME: "${NOTIFIER_SERVICE_CONTAINER_NAME:-logforge-notifier}"
       NOTIFIER_PLAIN_PORT: "${NOTIFIER_PLAIN_PORT:-8083}"
-    networks:
-      - logforge-network
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - logforge_core_data:/app/core/data
-    restart: always
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "logforge_core_data:/app/core/data"
+    networks:
+      - logforge
     ports:
       - "${EXPOSED_BACKEND_PORT:-8000}:${BACKEND_SERVICE_PORT:-8000}"
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
-  logforge-frontend:
-    image: madanb13/logforge-frontend:latest
-    container_name: ${FRONTEND_SERVICE_CONTAINER_NAME:-logforge-frontend}
+
+  frontend:
+    image: "madanb13/logforge-frontend:latest"
+    restart: unless-stopped
     environment:
-      VITE_BACKEND_SERVICE_HOST: "http://${BACKEND_SERVICE_CONTAINER_NAME:-logforge-backend}"
+      VITE_BACKEND_SERVICE_HOST: "backend"
       VITE_BACKEND_SERVICE_PORT: "${BACKEND_SERVICE_PORT:-8000}"
       VITE_EXPOSED_BACKEND_PORT: "${EXPOSED_BACKEND_PORT:-8000}"
       VITE_NOTIFIER_PORT: "${NOTIFIER_WEB_PORT:-8085}"
+    depends_on:
+      - backend
+    networks:
+      - logforge
     ports:
       - "${EXPOSED_FRONTEND_PORT:-3000}:${FRONTEND_SERVICE_PORT:-3000}"
-    networks:
-      - logforge-network
-    depends_on:
-      - logforge-backend
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
-  logforge-notifier:
-    image: madanb13/logforge-notifier:latest
-    container_name: ${NOTIFIER_SERVICE_CONTAINER_NAME:-logforge-notifier}
+
+  notifier:
+    image: "madanb13/logforge-notifier:latest"
+    restart: unless-stopped
+    volumes:
+      - "logforge_notifier_data:/app/data"
+      - "/etc/localtime:/etc/localtime:ro"
+    networks:
+      - logforge
     ports:
       - "${NOTIFIER_PLAIN_PORT:-8083}:8083"
       - "${NOTIFIER_WEB_PORT:-8085}:8085"
-    volumes:
-      - logforge_notifier_data:/app/data
-      - /etc/localtime:/etc/localtime:ro
-    networks:
-      - logforge-network
-    restart: unless-stopped
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
-  logforge-autoupdate:
-    image: madanb13/logforge-autoupdate:latest
-    container_name: ${AUTOUPDATE_SERVICE_NAME:-logforge-autoupdate}
+
+  autoupdate:
+    image: "madanb13/logforge-autoupdate:latest"
+    restart: unless-stopped
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    restart: always
+      - "/var/run/docker.sock:/var/run/docker.sock"
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
+
 networks:
-  logforge-network:
+  logforge:
+    name: "logforge-network"
     driver: bridge
+
 volumes:
-  logforge_notifier_data:
   logforge_core_data:
+  logforge_notifier_data: