Set environment variables with Docker Compose

.env.template

@@ -1,11 +1,4 @@
 TOKEN=
-INSTANCE=BETA
-
-# comma separated list of owner IDs
-OWNER_IDS=
-
-XP_GAIN_PER_MESSAGE=1
-XP_GAIN_COOLDOWN=8
 
 DBX_OAUTH2_REFRESH_TOKEN=
 DBX_APP_KEY=
@@ -14,3 +7,4 @@ DBX_APP_SECRET=
 MARIADB_USER=
 MARIADB_PASSWORD=
 MARIADB_ROOT_PASSWORD=
+MARIADB_DATABASE=racudb

Racu.py

@@ -16,7 +16,7 @@ async def get_prefix(bot, message):
     except AttributeError:
         return "."
 
-owner_ids = set(os.environ.get('OWNER_IDS').split(','))
+owner_ids = set(os.environ.get('RACU_OWNER_IDS').split(','))
 client = services.Client.RacuBot(
     owner_ids=owner_ids,
     command_prefix=get_prefix,
@@ -69,4 +69,4 @@ if __name__ == '__main__':
     # empty line to separate modules from system info in logs
     _logs.info("\n")
 
-    client.run(os.getenv('TOKEN'))
+    client.run(os.environ.get('RACU_TOKEN'))

db/database.py

@@ -2,24 +2,24 @@ import logging
 import os
 
 import mariadb
-from dotenv import load_dotenv
 
 _logs = logging.getLogger('Racu.Core')
-load_dotenv('.env')
+
 
 def create_connection_pool(name: str, size: int) -> mariadb.ConnectionPool:
     pool = mariadb.ConnectionPool(
         host="db",
         port=3306,
-        database="racudb",
-        user=os.getenv("MARIADB_USER"),
-        password=os.getenv("MARIADB_PASSWORD"),
+        database=os.environ.get("MARIADB_DATABASE"),
+        user=os.environ.get("MARIADB_USER"),
+        password=os.environ.get("MARIADB_PASSWORD"),
         pool_name=name,
         pool_size=size
     )
 
     return pool
 
+
 try:
     _cnxpool = create_connection_pool("core-pool", 25)
 except mariadb.Error as e:

docker-compose.yml

@@ -8,6 +8,19 @@ services:
       driver: "json-file"
       options:
         max-size: "50m"
+    environment:
+      RACU_TOKEN: ${TOKEN}
+      RACU_INSTANCE: BETA
+      RACU_OWNER_IDS: 784783517845946429
+      RACU_XP_GAIN_PER_MESSAGE: 1
+      RACU_XP_GAIN_COOLDOWN: 8
+      RACU_DBX_OAUTH2_REFRESH_TOKEN: ${DBX_OAUTH2_REFRESH_TOKEN}
+      RACU_DBX_APP_KEY: ${DBX_APP_KEY}
+      RACU_DBX_APP_SECRET: ${DBX_APP_SECRET}
+      MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
+      MARIADB_USER: ${MARIADB_USER}
+      MARIADB_PASSWORD: ${MARIADB_PASSWORD}
+      MARIADB_DATABASE: racudb
     volumes:
       - debuglog:/usr/src/app/logs
     depends_on:

modules/economy/blackjack.py

@@ -5,7 +5,6 @@ from datetime import datetime
 import discord
 import pytz
 from discord.ext import commands
-from dotenv import load_dotenv
 
 from config.parser import JsonCache
 from lib import interaction
@@ -16,7 +15,6 @@ from services.Currency import Currency
 
 resources = JsonCache.read_json("resources")
 logs = logging.getLogger('Racu.Core')
-load_dotenv('.env')
 est = pytz.timezone('US/Eastern')
 active_blackjack_games = {}
 

modules/misc/backup.py

@@ -4,17 +4,15 @@ import subprocess
 from datetime import datetime
 
 import dropbox
-from dotenv import load_dotenv
 
 logs = logging.getLogger('Racu.Core')
-load_dotenv('.env')
 
-oauth2_refresh_token = os.getenv("DBX_OAUTH2_REFRESH_TOKEN")
-app_key = os.getenv("DBX_APP_KEY")
-app_secret = os.getenv("DBX_APP_SECRET")
-instance = os.getenv("INSTANCE")
-mariadb_user = os.getenv("MARIADB_USER")
-mariadb_password = os.getenv("MARIADB_PASSWORD")
+oauth2_refresh_token = os.environ.get("RACU_DBX_OAUTH2_REFRESH_TOKEN")
+app_key = os.environ.get("RACU_DBX_APP_KEY")
+app_secret = os.environ.get("RACU_DBX_APP_SECRET")
+instance = os.environ.get("RACU_INSTANCE")
+mariadb_user = os.environ.get("RACU_MARIADB_USER")
+mariadb_password = os.environ.get("RACU_MARIADB_PASSWORD")
 
 if instance.lower() == "main":
     dbx = dropbox.Dropbox(

requirements.txt

@@ -1,5 +1,4 @@
 py-cord==2.5.0
-python-dotenv==1.0.1
 setuptools==69.2.0
 pytz==2024.1
 dropbox==11.36.2

services/Help.py

@@ -1,13 +1,10 @@
 import discord
 from discord.ext import commands
-from dotenv import load_dotenv
 
 from config.parser import JsonCache
 from lib.embeds.error import HelpErrors
-import lib.checks
 
 art = JsonCache.read_json("art")
-load_dotenv('.env')
 
 
 class RacuHelp(commands.HelpCommand):

services/xp_service.py

@@ -2,13 +2,11 @@ import os
 import time
 
 from discord.ext import commands
-from dotenv import load_dotenv
 
 from db import database
 
-load_dotenv('.env')
-xp_gain_per_message = int(os.getenv("XP_GAIN_PER_MESSAGE"))
-xp_gain_cooldown = int(os.getenv("XP_GAIN_COOLDOWN"))
+xp_gain_per_message = int(os.environ.get("RACU_XP_GAIN_PER_MESSAGE"))
+xp_gain_cooldown = int(os.environ.get("RACU_XP_GAIN_COOLDOWN"))
 
 
 class XpService: