From 1c8b86c664d68d2f7fe159d34959e52cdb17e16a Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <georges.antoine.assi@gmail.com>
Date: Fri, 1 Mar 2024 09:14:25 -0500
Subject: [PATCH] More cleanup of docker-compose

---
 backend/config/__init__.py          |  2 +-
 backend/handler/redis_handler.py    |  4 ++--
 docker-compose.yml                  |  2 +-
 examples/docker-compose.example.yml | 22 ++++++++--------------
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/backend/config/__init__.py b/backend/config/__init__.py
index 9ad9d09f4..16eadd2c5 100644
--- a/backend/config/__init__.py
+++ b/backend/config/__init__.py
@@ -27,7 +27,7 @@ DB_NAME: Final = os.environ.get("DB_NAME", "romm")
 
 # REDIS
 REDIS_HOST: Final = os.environ.get("REDIS_HOST", "localhost")
-REDIS_PORT: Final = os.environ.get("REDIS_PORT", "6379")
+REDIS_PORT: Final = int(os.environ.get("REDIS_PORT", 6379))
 REDIS_PASSWORD: Final = os.environ.get("REDIS_PASSWORD")
 
 # IGDB
diff --git a/backend/handler/redis_handler.py b/backend/handler/redis_handler.py
index 34c6a7a6f..6fe3156b0 100644
--- a/backend/handler/redis_handler.py
+++ b/backend/handler/redis_handler.py
@@ -40,7 +40,7 @@ class FallbackCache:
 
 
 redis_client = Redis(
-    host=REDIS_HOST, port=int(REDIS_PORT), password=REDIS_PASSWORD, db=0
+    host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWORD, db=0
 )
 
 redis_url = (
@@ -60,7 +60,7 @@ else:
     # A seperate client that auto-decodes responses is needed
     cache = Redis(
         host=REDIS_HOST,
-        port=int(REDIS_PORT),
+        port=REDIS_PORT,
         password=REDIS_PASSWORD,
         db=0,
         decode_responses=True,
diff --git a/docker-compose.yml b/docker-compose.yml
index 53e5848d4..ae399daa2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,6 @@ services:
     container_name: redis
     restart: unless-stopped
     ports:
-      - ${REDIS_PORT}:6379
+      - $REDIS_PORT:6379
     env_file:
       - .env
diff --git a/examples/docker-compose.example.yml b/examples/docker-compose.example.yml
index 5e5d30df1..ca05f56b8 100644
--- a/examples/docker-compose.example.yml
+++ b/examples/docker-compose.example.yml
@@ -10,8 +10,7 @@ services:
     container_name: romm
     restart: unless-stopped
     environment:
-      - DB_HOST=mariadb
-      - DB_PORT=3306
+      - DB_HOST=romm-db
       - DB_NAME=romm # Should match MYSQL_DATABASE in mariadb
       - DB_USER=romm-user # Should match MYSQL_USER in mariadb
       - DB_PASSWD= # Should match MYSQL_PASSWORD in mariadb
@@ -20,8 +19,7 @@ services:
       - ROMM_AUTH_SECRET_KEY= # Generate a key with `openssl rand -hex 32`
       - ROMM_AUTH_USERNAME=admin
       - ROMM_AUTH_PASSWORD= # default: admin
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
+      - REDIS_HOST=romm-redis
     volumes:
       - romm_resources:/romm/resources" # Resources fetched from IGDB (covers, screenshots, etc.)
       - "/path/to/library:/romm/library" # Your game library
@@ -31,12 +29,12 @@ services:
     ports:
       - 80:8080
     depends_on:
-      - mariadb
-      - redis
+      - romm-db
+      - romm-redis
 
-  mariadb:
+  romm-db:
     image: mariadb:latest
-    container_name: mariadb
+    container_name: romm-db
     restart: unless-stopped
     environment:
       - MYSQL_ROOT_PASSWORD= # Use a unique, secure password
@@ -45,12 +43,8 @@ services:
       - MYSQL_PASSWORD=
     volumes:
       - mysql_data:/var/lib/mysql
-    ports:
-      - 3306:3306
 
-  redis:
+  romm-redis:
     image: redis:alpine
-    container_name: redis
+    container_name: romm-redis
     restart: unless-stopped
-    ports:
-      - 6379:6379