From 927238f955542c78aaf8ea24360dc0314f626e46 Mon Sep 17 00:00:00 2001
From: Teck Meng <furyx@hotmail.com>
Date: Mon, 27 May 2024 19:13:12 +0800
Subject: [PATCH] Refactor docker-compose.yml to update URLs and remove
 unnecessary network configurations

---
 compose.yml      | 10 ----------
 compose/apps.yml |  6 ++++++
 compose/base.yml | 10 ++++++++++
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/compose.yml b/compose.yml
index fcadef5..86f9ead 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,13 +1,3 @@
-x-environment: &default-environment
-  LOG_LEVEL: "DEBUG"
-  ACME_PATH: "./acme.json"
-  NETWORK: "${NETWORK:-host}"
-  FIN_LOCATION: ""
-  STREAMLIT_FIN_SERVER_PORT: "8501"
-  GROQ_API_KEY: "${GROQ_API_KEY}"
-  BAI_LOCATION: ""
-  STREAMLIT_BAI_SERVER_PORT: "8502"
-
 networks:
   net:
     external: true
diff --git a/compose/apps.yml b/compose/apps.yml
index 4968ece..ee6313a 100644
--- a/compose/apps.yml
+++ b/compose/apps.yml
@@ -1,3 +1,9 @@
+x-environment: &default-environment
+  STREAMLIT_FIN_SERVER_PORT: "8501"
+  GROQ_API_KEY: "${GROQ_API_KEY}"
+  BAI_LOCATION: ""
+  STREAMLIT_BAI_SERVER_PORT: "8502"
+
 volumes:
   bai_cache: {}
   ghost_content: {}
diff --git a/compose/base.yml b/compose/base.yml
index 85ece81..7b54eda 100644
--- a/compose/base.yml
+++ b/compose/base.yml
@@ -1,3 +1,12 @@
+x-environment: &default-environment
+  LOG_LEVEL: "DEBUG"
+  ACME_PATH: "./acme.json"
+  NETWORK: "${NETWORK:-host}"
+  FIN_LOCATION: ""
+  STREAMLIT_FIN_SERVER_PORT: "8501"
+  GROQ_API_KEY: "${GROQ_API_KEY}"
+  BAI_LOCATION: ""
+  STREAMLIT_BAI_SERVER_PORT: "8502"
 
 volumes:
   logs: {}
@@ -45,4 +54,5 @@ services:
       # - "1883:1883"
       # - 18083:18083
     networks:
+      - host
       - net
\ No newline at end of file