From b46bcf5ab8461e2b43e11b06fd802240bebebb9a Mon Sep 17 00:00:00 2001
From: Choco <94597336+ChocoMeow@users.noreply.github.com>
Date: Fri, 1 Mar 2024 22:44:06 +0800
Subject: [PATCH] Updated docker-compose

---
 docker-compose.yml | 72 +++++++++++++++++++---------------------------
 update.py          |  2 +-
 2 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index aca68a0..e32409a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,64 +9,50 @@ services:
             - _JAVA_OPTIONS=-Xmx1G
             - SERVER_PORT=2333
         volumes:
-## Use "./" if you want to create a mount from your current directory (where docker-compose.yml is located)
-## Having access to files INSIDE the container is complicated. Mount function is used to have access to certain container files or folders.
-## Read more: https://docs.docker.com/storage/bind-mounts/ 
+            ## Use "./" if you want to create a mount from your current directory (where docker-compose.yml is located)
+            ## Having access to files INSIDE the container is complicated. Mount function is used to have access to certain container files or folders.
+            ## Read more: https://docs.docker.com/storage/bind-mounts/ 
             - ./application.yml:/opt/Lavalink/application.yml
         networks:
             - local
         expose:
             - "2333"
 
-## You can selfhost MongoDB. Just uncomment lines starting with single "#" below.
-    #mongo:
-        #image: mongo:latest
-        #container_name: mongo
-        #restart: unless-stopped
-        #volumes:
-## Use "./" if you want to create a mount from your current directory (where docker-compose.yml is located)
-## Having access to files INSIDE the container is complicated. Mount function is used to have access to certain container files or folders.
-## Read more: https://docs.docker.com/storage/bind-mounts/ 
-            #- ./data/mongo/db:/data/db
-            #- ./data/mongo/conf:/data/configdb
-        #environment:
-            #- MONGO_INITDB_ROOT_USERNAME=admin
-            #- MONGO_INITDB_ROOT_PASSWORD=admin
-        #expose:
-            #- "27017"
-        #networks:
-            #- local
-        #command: ["mongod", "--oplogSize=1024", "--wiredTigerCacheSizeGB=1", "--auth", "--noscripting"]
+    # # You can selfhost MongoDB. Just uncomment lines starting with single "#" below.
+    # mongo:
+    #     image: mongo:latest
+    #     container_name: mongo
+    #     restart: unless-stopped
+    #     volumes:
+    #         # Use "./" if you want to create a mount from your current directory (where docker-compose.yml is located)
+    #         # Having access to files INSIDE the container is complicated. Mount function is used to have access to certain container files or folders.
+    #         # Read more: https://docs.docker.com/storage/bind-mounts/ 
+    #         - ./data/mongo/db:/data/db
+    #         - ./data/mongo/conf:/data/configdb
+    #     environment:
+    #         - MONGO_INITDB_ROOT_USERNAME=admin
+    #         - MONGO_INITDB_ROOT_PASSWORD=admin
+    #     expose:
+    #         - "27017"
+    #     networks:
+    #         - local
+    #     command: ["mongod", "--oplogSize=1024", "--wiredTigerCacheSizeGB=1", "--auth", "--noscripting"]
 
     vocard:
         image: ghcr.io/chocomeow/vocard:v2.6.8
         container_name: vocard
         volumes:
-## Use "./" if you want to create a mount from your current directory (where docker-compose.yml is located)
-## Having access to files INSIDE the container is complicated. Mount function is used to have access to certain container files or folders.
-## Read more: https://docs.docker.com/storage/bind-mounts/ 
+            ## Use "./" if you want to create a mount from your current directory (where docker-compose.yml is located)
+            ## Having access to files INSIDE the container is complicated. Mount function is used to have access to certain container files or folders.
+            ## Read more: https://docs.docker.com/storage/bind-mounts/ 
             - ./settings.json:/app/settings.json
-        environment:
-            - TOKEN=YOUR_BOT_TOKEN
-            - CLIENT_ID=YOUR_BOT_CLIENT_ID
-            - CLIENT_SECRET_ID=YOUR_BOT_CLIENT_SECRET_ID
-            - SERCET_KEY=DASHBOARD_SERCET_KEY
-
-            - BUG_REPORT_CHANNEL_ID=YOUR_DISCORD_CHANNEL_ID
-
-            - SPOTIFY_CLIENT_ID=YOUR_SPOTIFY_CLIENT_ID
-            - SPOTIFY_CLIENT_SECRET=YOUR_SPOTIFY_CLIENT_SECRET
-
-            - GENIUS_TOKEN=YOUR_GENIUS_TOKEN
-
-            - MONGODB_URL=YOUR_MONGODB_URL
-            - MONGODB_NAME=YOUR_MONGODB_DB_NAME
-
+        env_file:
+            - .env
         depends_on:
             lavalink:
                 condition: service_started
-            mongo:
-                condition: service_started
+            # mongo:
+            #     condition: service_started
         networks:
             - local
 
diff --git a/update.py b/update.py
index 2342263..c4b9fbf 100644
--- a/update.py
+++ b/update.py
@@ -2,7 +2,7 @@ import requests, zipfile, os, shutil, argparse
 from io import BytesIO
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
-__version__ = "v2.6.8"
+__version__ = "v2.6.9b1"
 
 GITHUB_API_URL = "https://api.github.com/repos/ChocoMeow/Vocard/releases/latest"
 VOCARD_URL = "https://github.com/ChocoMeow/Vocard/archive/"