diff --git a/build b/build index d124b29..f51f2c5 100755 --- a/build +++ b/build @@ -7,7 +7,7 @@ set -eu # The resulting images are named wubloader-COMPONENT. # The different images we can build -COMPONENTS=(downloader) +COMPONENTS=(downloader restreamer) # The docker image tag, derived from the git commit + whether working tree is clean TAG=$(git rev-parse --short HEAD) diff --git a/restreamer/Dockerfile b/restreamer/Dockerfile index 84650bb..e23295f 100644 --- a/restreamer/Dockerfile +++ b/restreamer/Dockerfile @@ -1,5 +1,6 @@ FROM alpine:3.7 -RUN apk --update add py2-pip +# dependencies needed for compiling c extensions, plus ffmpeg for cutting +RUN apk --update add py2-pip gcc python-dev musl-dev ffmpeg # Install common lib first as it changes less COPY common /tmp/common @@ -9,7 +10,4 @@ RUN pip install /tmp/common && rm -r /tmp/common COPY restreamer /tmp/restreamer RUN pip install /tmp/restreamer && rm -r /tmp/restreamer -# Add config file last as it changes most -COPY config.yaml /etc/wubloader.yaml - -CMD python2 -m restreamer +ENTRYPOINT ["python2", "-m", "restreamer", "--base-dir", "/mnt"] diff --git a/restreamer/setup.py b/restreamer/setup.py index 47a450f..999c956 100644 --- a/restreamer/setup.py +++ b/restreamer/setup.py @@ -5,7 +5,9 @@ setup( version = "0.0.0", packages = find_packages(), install_requires = [ - "requests", + "argh", + "flask", + "gevent", "wubloader-common", ], )