From 3ec3b3cd992b58d44ca57b65d2436f7ac212012d Mon Sep 17 00:00:00 2001 From: Florian Kaiser <44125287+H4CK3R-01@users.noreply.github.com> Date: Wed, 16 Mar 2022 10:14:31 +0100 Subject: [PATCH 1/4] Update .drone.yml --- .drone.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.drone.yml b/.drone.yml index 2c4ae1d..dfc90d7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,6 +25,9 @@ steps: repo: from_secret: repo_webservice dockerfile: webservice/Dockerfile + when: + branch: + - main - name: publish_bot image: plugins/docker @@ -38,6 +41,9 @@ steps: repo: from_secret: repo_bot dockerfile: telegram_bot/Dockerfile + when: + branch: + - main - name: deploy image: appleboy/drone-ssh @@ -58,3 +64,6 @@ steps: PLUGIN_PASSWORD: from_secret: ssh_password PLUGIN_SCRIPT: /opt/docker/TelegramAktienBot/deploy.sh + when: + branch: + - main -- 2.45.2 From 1038a240937555922cb8895a14f0b74dd1185b54 Mon Sep 17 00:00:00 2001 From: Florian Kellermann Date: Wed, 16 Mar 2022 10:39:29 +0100 Subject: [PATCH 2/4] Removed pandas --- telegram_bot/news/news_fetcher.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/telegram_bot/news/news_fetcher.py b/telegram_bot/news/news_fetcher.py index 836b2fe..af07cb3 100644 --- a/telegram_bot/news/news_fetcher.py +++ b/telegram_bot/news/news_fetcher.py @@ -10,8 +10,6 @@ import sys import os import json -import pandas as pd - from newsapi import NewsApiClient from dotenv import load_dotenv -- 2.45.2 From f197b7574493a17278a7ed76c354310932e169ed Mon Sep 17 00:00:00 2001 From: H4CK3R-01 Date: Wed, 16 Mar 2022 10:41:13 +0100 Subject: [PATCH 3/4] Use python:3.10-slim --- telegram_bot/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/telegram_bot/Dockerfile b/telegram_bot/Dockerfile index df6b0ce..dc51065 100644 --- a/telegram_bot/Dockerfile +++ b/telegram_bot/Dockerfile @@ -1,7 +1,6 @@ -FROM python:3.10-alpine +FROM python:3.10-slim WORKDIR /srv/flask_app -RUN apk add build-base jpeg-dev zlib-dev musl-dev linux-headers g++ COPY telegram_bot/requirements.txt /srv/flask_app/ -- 2.45.2 From f7a09e063ca58a62e35f058829bef3670e77fb25 Mon Sep 17 00:00:00 2001 From: Florian Kellermann Date: Wed, 16 Mar 2022 10:41:43 +0100 Subject: [PATCH 4/4] Changed requirements --- telegram_bot/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/telegram_bot/requirements.txt b/telegram_bot/requirements.txt index d1a60c3..417310c 100644 --- a/telegram_bot/requirements.txt +++ b/telegram_bot/requirements.txt @@ -1,5 +1,5 @@ pyTelegramBotAPI~=4.4.0 -Markdown==3.3.6 -yfinance==0.1.70 -newsapi-python +Markdown~=3.3.6 +yfinance~=0.1.70 +newsapi-python~=0.2.6 python-dotenv~=0.19.2 -- 2.45.2