Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wxcafé
funkwhale
Commits
937c55fd
Verified
Commit
937c55fd
authored
7 years ago
by
Eliot Berriot
Browse files
Options
Downloads
Patches
Plain Diff
Install ffmpeg and magic
parent
4992029c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
api/Dockerfile
+1
-1
1 addition, 1 deletion
api/Dockerfile
api/docker/Dockerfile.test
+2
-1
2 additions, 1 deletion
api/docker/Dockerfile.test
api/requirements.apt
+2
-1
2 additions, 1 deletion
api/requirements.apt
api/requirements/base.txt
+2
-0
2 additions, 0 deletions
api/requirements/base.txt
with
7 additions
and
3 deletions
api/Dockerfile
+
1
−
1
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
...
...
This diff is collapsed.
Click to expand it.
api/docker/Dockerfile.test
+
2
−
1
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
...
...
This diff is collapsed.
Click to expand it.
api/requirements.apt
+
2
−
1
View file @
937c55fd
...
...
@@ -5,6 +5,7 @@ libjpeg-dev
zlib1g-dev
libpq-dev
postgresql-client
libav-tools
libmagic-dev
ffmpeg
python3-dev
curl
This diff is collapsed.
Click to expand it.
api/requirements/base.txt
+
2
−
0
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment