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

This commit is contained in:
Rripped 2022-03-16 11:18:16 +01:00
commit a6da04ac03
2 changed files with 13 additions and 2 deletions

View File

@ -25,6 +25,10 @@ steps:
repo: repo:
from_secret: repo_webservice from_secret: repo_webservice
dockerfile: webservice/Dockerfile dockerfile: webservice/Dockerfile
when:
branch:
include:
- main
- name: publish_bot - name: publish_bot
image: plugins/docker image: plugins/docker
@ -38,6 +42,10 @@ steps:
repo: repo:
from_secret: repo_bot from_secret: repo_bot
dockerfile: telegram_bot/Dockerfile dockerfile: telegram_bot/Dockerfile
when:
branch:
include:
- main
- name: deploy - name: deploy
image: appleboy/drone-ssh image: appleboy/drone-ssh
@ -58,3 +66,7 @@ steps:
PLUGIN_PASSWORD: PLUGIN_PASSWORD:
from_secret: ssh_password from_secret: ssh_password
PLUGIN_SCRIPT: /opt/docker/TelegramAktienBot/deploy.sh PLUGIN_SCRIPT: /opt/docker/TelegramAktienBot/deploy.sh
when:
branch:
include:
- main

View File

@ -1,7 +1,6 @@
FROM python:3.10-alpine FROM python:3.10-slim
WORKDIR /srv/flask_app 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/ COPY telegram_bot/requirements.txt /srv/flask_app/