From 2462cba3c4381470a900436f7fea5674d2c4c3b6 Mon Sep 17 00:00:00 2001 From: Homer S Date: Sat, 10 Jul 2021 09:08:58 +0200 Subject: [PATCH] Changed base image to alpine:latest. --- docker/Dockerfile | 22 +++++----------------- docker/docker-compose.yml | 2 +- requirements.txt | 4 ++-- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4989b6a..88cf2f2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,9 @@ # syntax=docker/dockerfile:1 -FROM ubuntu:latest +FROM alpine:latest ENV TZ=Europe/Berlin +ENV UNBUFFERED=1 WORKDIR /app VOLUME /app @@ -10,23 +11,10 @@ VOLUME /app COPY . . RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone; \ - /bin/bash -c 'apt update && apt install -y libolm-dev python3-pip ffmpeg htop; \ + /bin/sh -c 'apk update && apk add --no-cache gcc musl-dev python3-dev py3-pip libffi-dev openssl-dev cargo zlib-dev jpeg-dev speex ffmpeg htop; \ pip install update pip && pip install -r requirements.txt ;' + # apk del zlib-dev jpeg-dev gcc musl-dev python3-dev libffi-dev openssl-dev cargo;' -ENTRYPOINT ["./fritzab2matrix.py "] - - - - - - - - - - - - - - +ENTRYPOINT ["python3", "-u", "fritzab2matrix.py "] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7c963f5..49e9071 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,7 +7,7 @@ services: context: ../. dockerfile: ./docker/Dockerfile working_dir: /app - entrypoint: ./fritzab2matrix.py + entrypoint: /bin/sh -c "export UNBUFFERED=1 && python3 -u ./fritzab2matrix.py" volumes: - ../.:/app diff --git a/requirements.txt b/requirements.txt index aed142a..8cdb0c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,12 +7,12 @@ pydub # for matrix-commander aiohttp -aiofiles<0.5.0,>=0.4.0 +aiofiles argparse asyncio datetime markdown -matrix-nio[e2e]>=0.14.1 +matrix-nio Pillow python_magic uuid