MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Install ffmpeg and magic

This commit is contained in:
Eliot Berriot 2018-02-18 22:06:10 +01:00
parent 4992029c8a
commit 937c55fdd5
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/Dockerfile
View File

@ -3,7 +3,7 @@ FROM python:3.5
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
# Requirements have to be pulled and installed here, otherwise caching won't work # Requirements have to be pulled and installed here, otherwise caching won't work
RUN echo 'deb http://httpredir.debian.org/debian/ jessie-backports main' > /etc/apt/sources.list.d/ffmpeg.list
COPY ./requirements.apt /requirements.apt COPY ./requirements.apt /requirements.apt
RUN apt-get update -qq && grep "^[^#;]" requirements.apt | xargs apt-get install -y RUN apt-get update -qq && grep "^[^#;]" requirements.apt | xargs apt-get install -y
RUN curl -L https://github.com/acoustid/chromaprint/releases/download/v1.4.2/chromaprint-fpcalc-1.4.2-linux-x86_64.tar.gz | tar -xz -C /usr/local/bin --strip 1 RUN curl -L https://github.com/acoustid/chromaprint/releases/download/v1.4.2/chromaprint-fpcalc-1.4.2-linux-x86_64.tar.gz | tar -xz -C /usr/local/bin --strip 1

3
api/docker/Dockerfile.test
View File

@ -1,9 +1,10 @@
FROM python:3.5 FROM python:3.5
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONDONTWRITEBYTECODE 1
# Requirements have to be pulled and installed here, otherwise caching won't work # Requirements have to be pulled and installed here, otherwise caching won't work
RUN echo 'deb http://httpredir.debian.org/debian/ jessie-backports main' > /etc/apt/sources.list.d/ffmpeg.list
COPY ./requirements.apt /requirements.apt COPY ./requirements.apt /requirements.apt
COPY ./install_os_dependencies.sh /install_os_dependencies.sh COPY ./install_os_dependencies.sh /install_os_dependencies.sh
RUN bash install_os_dependencies.sh install RUN bash install_os_dependencies.sh install

3
api/requirements.apt
View File

@ -5,6 +5,7 @@ libjpeg-dev
zlib1g-dev zlib1g-dev
libpq-dev libpq-dev
postgresql-client postgresql-client
libav-tools libmagic-dev
ffmpeg
python3-dev python3-dev
curl curl

2
api/requirements/base.txt
View File

@ -57,3 +57,5 @@ git+https://github.com/EliotBerriot/django-cachalot.git@django-2
django-dynamic-preferences>=1.5,<1.6 django-dynamic-preferences>=1.5,<1.6
pyacoustid>=1.1.5,<1.2 pyacoustid>=1.1.5,<1.2
raven>=6.5,<7 raven>=6.5,<7
python-magic==0.4.15
ffmpeg-python==0.1.10