feat: container fixes

bin/kruhobot

@@ -5,17 +5,16 @@ import logging
 import os
 
 
-LOG_FOLDER = os.environ.get("KRUHOBOT_LOG", '.')
+KRUHOBOT_FOLDER = os.environ.get("KRUHOBOT_FOLDER", '.')
-CONFIG_FOLDER = os.environ.get("KRUHOBOT_ETC", '.')
 
 
 logger = logging.getLogger('kruhobot')
 logger.setLevel(logging.INFO)
-handler = logging.FileHandler(filename=os.path.join(LOG_FOLDER, 'kruhobot.log'), encoding='utf-8', mode='w')
+handler = logging.FileHandler(filename=os.path.join(KRUHOBOT_FOLDER, 'kruhobot.log'), encoding='utf-8', mode='w')
 handler.setFormatter(logging.Formatter('%(asctime)s:%(levelname)s:%(name)s: %(message)s'))
 logger.addHandler(handler)
 
-with open(os.path.join(CONFIG_FOLDER, 'config.json'), 'r', encoding='utf-8') as f:
+with open(os.path.join(KRUHOBOT_FOLDER, 'config.json'), 'r', encoding='utf-8') as f:
     config = json.load(f)
 
 bot = commands.Bot()
@@ -26,4 +25,5 @@ bot.load_extension('kruhobot.cogs.utils')
 async def statistics(interaction):
     logger.info(f"{interaction.user} ({interaction.user.id}) used command {interaction.data['name']}.")
 
+logger.info("Starting bot")
 bot.run(config["token"])

cobuild/010-service.d/kruhobot.service

@@ -6,9 +6,7 @@ After=network.target
 Type=exec
 ExecStartPre=mkdir -p /data/kruhobot
 ExecStart=/srv/kruhobot/bin/kruhobot
-Environment=KRUHOBOT_DATA=/data/kruhobot
+Environment=KRUHOBOT_FOLDER=/kruhobot
-Environment=KRUHOBOT_ETC=/data/kruhobot
-Environment=KRUHOBOT_LOG=/data/log
 Restart=on-failure
 RestartSec=5min
 

cobuild/Dockerfile.top

@@ -2,3 +2,5 @@ FROM docker://registry.ks.matfyz.cz/gimli/base:bookworm
 COPY bin /build/src/bin
 COPY kruhobot /build/src/kruhobot
 COPY setup.py /build/src
+
+COPY config.json /kruhobot/config.json

config.example.json

@@ -1,6 +1,6 @@
 {
     "server_ID": 0,
-    "bot_token": "token",
+    "token": "token",
     "kruhove_role": {
         "kruh-XX": 0
     }

setup.py

@@ -5,7 +5,7 @@ import setuptools
 setuptools.setup(
     name='kruhobot',
     version='0.1',
-    description='Discordový bot pro správu Kruhového serveru',
+    description='Discordový bot pro správu Kruhového serveru spolku Matfyz HELP',
     packages=['kruhobot', 'kruhobot/cogs'],
     scripts=[
         'bin/kruhobot',