docker/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM python:alpine
+FROM alpine:latest 
 
 ENV TZ=Europe/Berlin
 ENV UNBUFFERED=1
@@ -11,20 +11,10 @@ VOLUME /app
 COPY . .
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone; \
-    apk --no-cache update && apk add --no-cache  --virtual .build-deps \
+    /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; \
-    gcc \
+    pip install update pip && pip install -r requirements.txt ; \
-    cargo \
+    apk del zlib-dev jpeg-dev gcc musl-dev python3-dev openssl-dev cargo;'
-    libffi-dev \
-    openssl-dev \
-    olm-dev \
-    zlib-dev \
-    jpeg-dev ; \
-    apk add --no-cache olm libmagic ffmpeg speex; \
-    pip install pip -U --no-cache-dir; \
-    pip install --no-cache-dir -r requirements.txt ; \
-    apk del --no-cache .build-deps;
 
 
 
-# ENTRYPOINT ["python3", "-u", "fritzab2matrix.py"]
+ENTRYPOINT ["python3", "-u", "fritzab2matrix.py "]
-ENTRYPOINT /bin/sh -c "export UNBUFFERED=1 && python3 -u ./fritzab2matrix.py"

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
 

fritzab2matrix.py

@@ -70,20 +70,13 @@ def get_last_call():
     except:
         print("Couldn't connect to Box")
     missed_calls = fc.get_missed_calls(False,1,1)
-    
+    return missed_calls[0]
-    if len(missed_calls) > 0:
-        return missed_calls[0]
-    else:
-        return False
 
 def lastcall2matrix(tam,tam_no):
     # Call Watch to Matrix
     if env_call_watch and not at_least_one_new_message:
         c = get_last_call()
-        if c:
+        c_msg = "{} - {} ({})".format(c.Date, c.Caller, c.Name)
-            c_msg = "{} - {} ({})".format(c.Date, c.Caller, c.Name)
-        else:
-            return False
         
         # ... and send message and file to Matrix Room
         ## if Number of a TAM and the last call match

libs/monitoring/__init__.py

@@ -15,17 +15,10 @@ def watch_disconnect(monitor, event_queue, func, tams, healthcheck_interval=10):
         else:
             # do event processing here:
             print(event)
-            if 'DISCONNECT;0' in event:
+            if 'DISCONNECT' in event:
-                print("Incoming call stopped. Check the TAM.\n")
+                print("Anruf beendet. Jetzt den AB checken.\n")
                 func(tams)
 
-            elif 'DISCONNECT;1' in event:
-                print("Outgoing call stopped. Do nothing.\n")
-
-            else:
-                print("Unknown event.\n")
-
-
 
 
 def endedCall(func, tams, fritz_ip='192.168.1.1'):

requirements.txt

@@ -15,9 +15,9 @@ atomicwrites
 cachetools
 datetime
 markdown
-matrix-nio[e2e]>=0.18.3
+matrix-nio # [e2e]>=0.18.3
 peewee
 Pillow
-python-magic
+python_magic
 uuid