* had a hard time with docker image only to find out in the end - after hours - that I commented out the matrix-commander command for testing purposes :see-no-evil:
* There is still testing if I use ENTRYPOINT in the _Dockerfile_ or only entrypoint in the _docker-compose.yml_ as the latter worked well and without any problem. * fritzab2matrix.py is now executable (WATCHOUT! The hashbang points to your system's python3 NOT to your virtualenv where the dependencies are met!) * the monitoring is now part of the main function
This commit is contained in:
parent
a086cd15eb
commit
654f6720fa
|
@ -3,23 +3,20 @@
|
||||||
FROM ubuntu:latest
|
FROM ubuntu:latest
|
||||||
|
|
||||||
ENV TZ=Europe/Berlin
|
ENV TZ=Europe/Berlin
|
||||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
VOLUME /app
|
VOLUME /app
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
RUN ls -la
|
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone; \
|
||||||
RUN ["cat", "/app/requirements.txt"]
|
/bin/bash -c 'apt update && apt install -y libolm-dev python3-pip ffmpeg htop; \
|
||||||
|
pip install update pip && pip install -r requirements.txt ;'
|
||||||
RUN /bin/bash -c 'apt update && apt install -y libolm-dev python3-pip ffmpeg;'
|
|
||||||
|
|
||||||
|
|
||||||
RUN pip install update pip && pip install -r requirements.txt
|
|
||||||
|
|
||||||
|
ENTRYPOINT ["./fritzab2matrix.py "]
|
||||||
CMD python3 fritzab2matrix.py && tail -f /dev/null
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,9 @@ services:
|
||||||
context: ../.
|
context: ../.
|
||||||
dockerfile: ./docker/Dockerfile
|
dockerfile: ./docker/Dockerfile
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
volumes:
|
entrypoint: ./fritzab2matrix.py
|
||||||
- ./:/app
|
# volumes:
|
||||||
|
# - ./:/app
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#! /usr/bin/python3
|
||||||
|
|
||||||
from fritzconnection import FritzConnection
|
from fritzconnection import FritzConnection
|
||||||
from dotenv import load_dotenv
|
from dotenv import load_dotenv
|
||||||
|
@ -85,7 +86,7 @@ def main():
|
||||||
|
|
||||||
# ... and send message and file to Matrix Room
|
# ... and send message and file to Matrix Room
|
||||||
command = "python3 matrix-commander.py -a " + os.path.join(env_tmp,"message.ogg") + " -m '{}'".format(msg_info)
|
command = "python3 matrix-commander.py -a " + os.path.join(env_tmp,"message.ogg") + " -m '{}'".format(msg_info)
|
||||||
# os.system(command)
|
os.system(command)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
# Mark MessageInfo as too short for the log
|
# Mark MessageInfo as too short for the log
|
||||||
|
@ -108,17 +109,25 @@ def main():
|
||||||
continue
|
continue
|
||||||
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
main()
|
|
||||||
|
|
||||||
### Monitor the FritzBox and trigger the main script whenever a call disconnects ###
|
### Monitor the FritzBox and trigger the main script whenever a call disconnects ###
|
||||||
###################################################################################
|
###################################################################################
|
||||||
endedCall(main, env_ip)
|
endedCall(main, env_ip)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
try:
|
||||||
|
print("I enter the main loop ...")
|
||||||
|
while main():
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
print("I left the main loop!")
|
||||||
|
|
||||||
|
except:
|
||||||
|
print("An erroneous error happened!")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue