Get branch to state of master.

This commit is contained in:
Homer S. 2021-07-10 18:42:18 +02:00
commit 22af5f80eb
4 changed files with 11 additions and 23 deletions

View File

@ -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. 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 ## 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 ## Installation
If you like to test this repository you are recommended to use one of the following two options. If you like to test this repository you are recommended to use one of the following two options.
### Necessary preparations for both cases ### Necessary preparations for both cases
@ -67,4 +67,4 @@ Especially to
* https://github.com/jiaaro/pydub/ * https://github.com/jiaaro/pydub/
* https://git.savannah.nongnu.org/cgit/fbvbconv-py.git/ * https://git.savannah.nongnu.org/cgit/fbvbconv-py.git/

View File

@ -1,8 +1,9 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM ubuntu:latest FROM alpine:latest
ENV TZ=Europe/Berlin ENV TZ=Europe/Berlin
ENV UNBUFFERED=1
WORKDIR /app WORKDIR /app
VOLUME /app VOLUME /app
@ -10,23 +11,10 @@ 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/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 ;' 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 "]

View File

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

View File

@ -7,12 +7,12 @@ pydub
# for matrix-commander # for matrix-commander
aiohttp aiohttp
aiofiles<0.5.0,>=0.4.0 aiofiles
argparse argparse
asyncio asyncio
datetime datetime
markdown markdown
matrix-nio[e2e]>=0.14.1 matrix-nio
Pillow Pillow
python_magic python_magic
uuid uuid