Merge pull request #9 from MasterGroosha/dev

Some improvements to Docker build and code

Author: MasterGroosha

.gitlab-ci.yml

@@ -0,0 +1,3 @@
+include:
+  - project: "groosha/ci_configurations"
+    file: "my-id-bot.yml"

Dockerfile

@@ -1,7 +1,10 @@
 FROM python:3.8-slim-buster
 WORKDIR /app
-RUN mkdir /logs
+RUN mkdir /app/logs
+COPY start.sh /app/
+RUN chmod +x /app/start.sh
 COPY requirements.txt /app/requirements.txt
-RUN pip install -r /app/requirements.txt
+RUN pip install --no-cache-dir --upgrade pip \
+    && pip install --no-cache-dir -r /app/requirements.txt
 COPY *.py /app/
-CMD ["python", "bot.py"]
+CMD ["/app/start.sh"]

bot.py

@@ -194,10 +194,11 @@ async def setup_bot_commands(dispatcher: Dispatcher):
     """
     Here we setup bot commands to make them visible in Telegram UI
     """
-    await bot.set_my_commands([
+    bot_commands = [
         types.BotCommand(command="/id", description="Tell your ID or group's ID"),
-        types.BotCommand(command="/help", description="Help and source code"),
-    ])
+        types.BotCommand(command="/help", description="Help and source code")
+    ]
+    await bot.set_my_commands(bot_commands)
 
 
 if __name__ == "__main__":

docker-compose.dev docker-compose-dev.ymldocker-compose.dev renamed to docker-compose-dev.yml

@@ -1,7 +1,10 @@
 version: "3.8"
 services:
     bot:
-        build: .
+        build:
+            context: $BUILD_PATH
+            dockerfile: Dockerfile
+        image: my-id-bot:dev
         container_name: "my-id-bot-dev"
         volumes:
             - "/tmp/my_id_bot_dev_logs:/logs"

requirements.txt

@@ -1 +1 @@
-aiogram>=2.9.2
+aiogram==2.11

start.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# cd to script directory
+cd "$(dirname "$0")" || exit 1
+
+LOGS_DIR="/app/logs"
+
+# If log files don't exist, create them
+LOG_NORMAL="$LOGS_DIR/my_id_bot.log"
+if [ ! -f "$LOG_NORMAL" ]; then
+  touch "$LOG_NORMAL"
+fi
+
+LOG_ERRORS="$LOGS_DIR/err.log"
+if [ ! -f "$LOG_ERRORS" ]; then
+  touch "$LOG_ERRORS"
+fi
+
+# start bot
+python bot.py