Merge branch 'docker'

This commit is contained in:
Homer S. 2021-07-11 16:29:12 +02:00
commit 6652def351
2 changed files with 13 additions and 5 deletions

View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM alpine:latest FROM python:alpine
ENV TZ=Europe/Berlin ENV TZ=Europe/Berlin
ENV UNBUFFERED=1 ENV UNBUFFERED=1
@ -11,9 +11,17 @@ VOLUME /app
COPY . . COPY . .
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone; \ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone; \
/bin/sh -c 'apk update && apk add --no-cache gcc musl-dev python3-dev py3-wheel py3-pip py3-olm libffi-dev openssl-dev cargo zlib-dev jpeg-dev libmagic speex ffmpeg htop; \ apk --no-cache update && apk add --no-cache --virtual .build-deps \
pip install update pip && pip install -r requirements.txt ; \ gcc \
apk del zlib-dev jpeg-dev gcc musl-dev python3-dev openssl-dev cargo;' cargo \
libffi-dev \
openssl-dev \
zlib-dev \
jpeg-dev ; \
apk add --no-cache ffmpeg speex; \
pip install --no-cache-dir upgrade pip; \
pip install --no-cache-dir -r requirements.txt ; \
apk del --no-cache .build-deps;

View File

@ -7,7 +7,7 @@ services:
context: ../. context: ../.
dockerfile: ./docker/Dockerfile dockerfile: ./docker/Dockerfile
working_dir: /app working_dir: /app
entrypoint: /bin/sh -c "export UNBUFFERED=1 && python3 -u ./fritzab2matrix.py" # entrypoint: /bin/sh -c "export UNBUFFERED=1 && python3 -u ./fritzab2matrix.py"
volumes: volumes:
- ../.:/app - ../.:/app