Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
jovuit
funkwhale
Commits
937c55fd
Verified
Commit
937c55fd
authored
Feb 18, 2018
by
Eliot Berriot
Browse files
Install ffmpeg and magic
parent
4992029c
Changes
4
Hide whitespace changes
Inline
Side-by-side
api/Dockerfile
View file @
937c55fd
...
...
@@ -3,7 +3,7 @@ FROM python:3.5
ENV
PYTHONUNBUFFERED 1
# 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
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
...
...
api/docker/Dockerfile.test
View file @
937c55fd
FROM
python
:
3.5
ENV
PYTHONUNBUFFERED
1
ENV
PYTHONDONTWRITEBYTECODE
1
ENV
PYTHONDONTWRITEBYTECODE
1
# 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
.
/
install_os_dependencies
.
sh
/
install_os_dependencies
.
sh
RUN
bash
install_os_dependencies
.
sh
install
...
...
api/requirements.apt
View file @
937c55fd
...
...
@@ -5,6 +5,7 @@ libjpeg-dev
zlib1g-dev
libpq-dev
postgresql-client
libav-tools
libmagic-dev
ffmpeg
python3-dev
curl
api/requirements/base.txt
View file @
937c55fd
...
...
@@ -57,3 +57,5 @@ git+https://github.com/EliotBerriot/django-cachalot.git@django-2
django-dynamic-preferences>=1.5,<1.6
pyacoustid>=1.1.5,<1.2
raven>=6.5,<7
python-magic==0.4.15
ffmpeg-python==0.1.10
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment