From b6d71297c6c701de60e6cdcb658a657e5c0d49e6 Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Sat, 11 Nov 2023 09:37:27 +1100 Subject: [PATCH] bus_analyzer: Make dockerfile work --- bus_analyzer/Dockerfile | 9 +++++++-- bus_analyzer/setup.py | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bus_analyzer/Dockerfile b/bus_analyzer/Dockerfile index 9f643b9..3d7276a 100644 --- a/bus_analyzer/Dockerfile +++ b/bus_analyzer/Dockerfile @@ -1,14 +1,19 @@ FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev zlib-dev jpeg-dev file make busybox-extras # Install gevent so that we don't need to re-install it when common changes RUN pip install gevent +# Install common lib first as it changes less +COPY common /tmp/common +RUN pip install /tmp/common && rm -r /tmp/common + # Actual application +RUN apk add ffmpeg COPY bus_analyzer /tmp/bus_analyzer -RUN pip install /tmp/bus_analyzer && rm -r /tmp/bus_analyzer +RUN pip install /tmp/bus_analyzer && cp -r /tmp/bus_analyzer/odo-digit-prototypes / && rm -r /tmp/bus_analyzer LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader ENTRYPOINT ["python3", "-m", "bus_analyzer"] diff --git a/bus_analyzer/setup.py b/bus_analyzer/setup.py index a9101bd..8521ad4 100644 --- a/bus_analyzer/setup.py +++ b/bus_analyzer/setup.py @@ -10,6 +10,7 @@ setup( install_requires=[ "argh==0.28.1", "gevent", + "Pillow", "psycogreen", "psycopg2", "python-dateutil",