diff --git a/pandora/Dockerfile b/pandora/Dockerfile index dbac46e..23b0306 100644 --- a/pandora/Dockerfile +++ b/pandora/Dockerfile @@ -12,12 +12,12 @@ RUN \ RUN \ # Install runtime dependencies - apk --no-cache add ffmpeg freetype imagemagick imlib2 libogg libjpeg-turbo libtheora libvpx mkvtoolnix nginx poppler-utils py3-psycopg2 py3-numpy py3-geoip py3-lxml s6 zlib \ + apk --no-cache add ffmpeg imagemagick imlib2 libogg libtheora libvpx mkvtoolnix nginx poppler-utils py3-geoip py3-lxml py3-numpy py3-pillow py3-psycopg2 s6 \ && pip3 install pyinotify youtube-dl RUN \ # Install build dependencies - apk --no-cache add --virtual .deps autoconf automake build-base flac-dev freetype-dev git imlib2-dev libjpeg-turbo-dev libogg-dev libtheora-dev libtool libvpx-dev libvorbis-dev python3-dev zlib-dev \ + apk --no-cache add --virtual .deps autoconf automake build-base flac-dev git imlib2-dev libogg-dev libtheora-dev libtool libvpx-dev libvorbis-dev python3-dev \ # Compile liboggz && wget https://ftp.osuosl.org/pub/xiph/releases/liboggz/liboggz-1.1.1.tar.gz -O /tmp/liboggz.tgz \ && tar xf /tmp/liboggz.tgz -C /tmp \ @@ -53,9 +53,6 @@ RUN \ && pip3 install -e /srv/pandora/src/python-ox \ && pip3 install -e /srv/pandora/src/oxtimelines \ && pip3 install -r /srv/pandora/requirements.txt \ - && pip3 install "pillow<4.2.0" \ - # Hackfix get_version() for oxjs - && sed -i 's/version = get_version()/version = "unknown"/' /srv/pandora/static/oxjs/tools/build/build.py \ # Compile pyc and static files && cd /srv/pandora/pandora \ && ln -s config.pandora.jsonc config.jsonc \