Merge remote-tracking branch 'origin/main' into bot

.woodpecker/pipeline.yml

@@ -39,24 +39,7 @@ pipeline:
         from_secret: password
       registry:
         from_secret: registry
-      dockerfile: telegram_bot/Dockerfile.bot
+      dockerfile: telegram_bot/Dockerfile
-      platforms: linux/amd64
-    when:
-      path: "telegram_bot/**"
-      event: push
-
-  build_bot_updates:
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo:
-        from_secret: repo_bot_updates
-      username:
-        from_secret: username
-      password:
-        from_secret: password
-      registry:
-        from_secret: registry
-      dockerfile: telegram_bot/Dockerfile.updates
       platforms: linux/amd64
     when:
       path: "telegram_bot/**"

deploy/aktienbot/.env.bot

@@ -1,3 +1,6 @@
 BOT_API_KEY=
 NEWS_API_KEY=
 SECRET_KEY=
+
+BOT_EMAIL=
+BOT_PASSWORD=

deploy/aktienbot/docker-compose.yml

@@ -30,11 +30,6 @@ services:
     env_file:
       - ${PWD}/.env.bot
 
-  aktienbot_bot_updates:
-    image: registry.flokaiser.com/aktienbot/bot_updates
-    env_file:
-      - ${PWD}/.env.bot
-
   mariadb:
     image: mariadb
     volumes:

telegram_bot/Dockerfile

@@ -10,5 +10,8 @@ RUN pip install -r requirements.txt --src /usr/local/src --no-warn-script-locati
 # Copy the source code to the working directory
 COPY telegram_bot /srv/flask_app
 
-# Run the application
+# Change file permissions
-CMD ["/usr/local/bin/python", "bot.py"]
+RUN chmod +x ./deploy/start.sh
+
+# Run the app
+CMD ["./deploy/start.sh"]

telegram_bot/Dockerfile.updates

@@ -1,14 +0,0 @@
-FROM python:3.10-slim
-
-# Change the working directory to the root of the project
-WORKDIR /srv/flask_app
-
-# Install the dependencies
-COPY telegram_bot/requirements.txt /srv/flask_app/
-RUN pip install -r requirements.txt --src /usr/local/src --no-warn-script-location
-
-# Copy the source code to the working directory
-COPY telegram_bot /srv/flask_app
-
-# Run the application
-CMD ["/usr/local/bin/python", "bot_updates.py"]

telegram_bot/deploy/start.sh

@@ -1,3 +1,4 @@
 #!/usr/bin/env sh
 
-python bot.py
+python bot.py &
+python bot_updates.py