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/3] 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 From f197b7574493a17278a7ed76c354310932e169ed Mon Sep 17 00:00:00 2001 From: H4CK3R-01 Date: Wed, 16 Mar 2022 10:41:13 +0100 Subject: [PATCH 2/3] 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/ From 7cdc6bc57d2327832a8898651c1c9b4c31fd5f1d Mon Sep 17 00:00:00 2001 From: Florian Kaiser <44125287+H4CK3R-01@users.noreply.github.com> Date: Wed, 16 Mar 2022 10:49:25 +0100 Subject: [PATCH 3/3] Update .drone.yml --- .drone.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index dfc90d7..b4ab91f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,7 +27,8 @@ steps: dockerfile: webservice/Dockerfile when: branch: - - main + include: + - main - name: publish_bot image: plugins/docker @@ -43,7 +44,8 @@ steps: dockerfile: telegram_bot/Dockerfile when: branch: - - main + include: + - main - name: deploy image: appleboy/drone-ssh @@ -66,4 +68,5 @@ steps: PLUGIN_SCRIPT: /opt/docker/TelegramAktienBot/deploy.sh when: branch: - - main + include: + - main