From 60adf393ef95a28f4601f4077cb87cb2f0b82044 Mon Sep 17 00:00:00 2001 From: Homer S Date: Wed, 14 Jul 2021 21:08:24 +0200 Subject: [PATCH] Further corrections on docker build related files. --- docker/Dockerfile | 4 ++-- docker/docker-compose.yml | 2 +- requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f7d100f..da7b7ac 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -19,8 +19,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone; olm-dev \ zlib-dev \ jpeg-dev ; \ - apk add --no-cache ffmpeg speex; \ - pip install --no-cache-dir upgrade pip; \ + apk add --no-cache olm libmagic ffmpeg speex; \ + pip --no-cache-dir install upgrade pip; \ pip install --no-cache-dir -r requirements.txt ; \ apk del --no-cache .build-deps; diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 74ed631..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: /bin/sh -c "export UNBUFFERED=1 && python3 -u ./fritzab2matrix.py" + entrypoint: /bin/sh -c "export UNBUFFERED=1 && python3 -u ./fritzab2matrix.py" volumes: - ../.:/app diff --git a/requirements.txt b/requirements.txt index 25b1498..808ef62 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ atomicwrites cachetools datetime markdown -matrix-nio # [e2e]>=0.18.3 +matrix-nio[e2e]>=0.18.3 peewee Pillow python-magic