diff --git a/README.md b/README.md index 1ed0803..7494173 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ __FritzAB2Matrix__ reads out the answering machine (_TAM_) of a _Fritz!Box_ in y Uses the python based cmd-line-tool [matrix-commander](https://github.com/8go/matrix-commander) so the matrix-commander.py in this repo is just a copy of that file to ease testing. ## Features - * Since _v0.1.1_ __Multitam__ is integrated so that you can check multiple answering machines __and__ post the messages to different matrix rooms. (Use FRITZ\_TAM_ variable in .env file) + * Since _v0.1.1_ __Multitam__ is integrated so that you can check multiple answering machines __and__ post the messages to different matrix rooms. (Use _FRITZ\_TAM_ variable in .env file) ## Installation If you like to test this repository you are recommended to use one of the following two options. ### Necessary preparations for both cases @@ -67,4 +67,4 @@ Especially to * https://github.com/jiaaro/pydub/ * https://git.savannah.nongnu.org/cgit/fbvbconv-py.git/ - + \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 4989b6a..1091952 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; \ - pip install update pip && pip install -r requirements.txt ;' - - - -ENTRYPOINT ["./fritzab2matrix.py "] - - - - - - - - - - - + /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 ["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