restreamer: Make docker image work, fix missing dependencies

setup.py and Dockerfile were both totally out of whack
pull/15/head
Mike Lang 6 years ago committed by Mike Lang
parent 1dce14bf77
commit 7ffa90c7e6

@ -7,7 +7,7 @@ set -eu
# The resulting images are named wubloader-COMPONENT. # The resulting images are named wubloader-COMPONENT.
# The different images we can build # 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 # The docker image tag, derived from the git commit + whether working tree is clean
TAG=$(git rev-parse --short HEAD) TAG=$(git rev-parse --short HEAD)

@ -1,5 +1,6 @@
FROM alpine:3.7 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 # Install common lib first as it changes less
COPY common /tmp/common COPY common /tmp/common
@ -9,7 +10,4 @@ RUN pip install /tmp/common && rm -r /tmp/common
COPY restreamer /tmp/restreamer COPY restreamer /tmp/restreamer
RUN pip install /tmp/restreamer && rm -r /tmp/restreamer RUN pip install /tmp/restreamer && rm -r /tmp/restreamer
# Add config file last as it changes most ENTRYPOINT ["python2", "-m", "restreamer", "--base-dir", "/mnt"]
COPY config.yaml /etc/wubloader.yaml
CMD python2 -m restreamer

@ -5,7 +5,9 @@ setup(
version = "0.0.0", version = "0.0.0",
packages = find_packages(), packages = find_packages(),
install_requires = [ install_requires = [
"requests", "argh",
"flask",
"gevent",
"wubloader-common", "wubloader-common",
], ],
) )

Loading…
Cancel
Save