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
8dea9130
Verified
Commit
8dea9130
authored
7 years ago
by
Eliot Berriot
Browse files
Options
Downloads
Patches
Plain Diff
Smaller docker image
parent
ce3af519
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
api/Dockerfile
+5
-1
5 additions, 1 deletion
api/Dockerfile
api/docker/Dockerfile.test
+6
-3
6 additions, 3 deletions
api/docker/Dockerfile.test
api/requirements.apt
+3
-6
3 additions, 6 deletions
api/requirements.apt
with
14 additions
and
10 deletions
api/Dockerfile
+
5
−
1
View file @
8dea9130
...
...
@@ -5,7 +5,11 @@ 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
apt-get update
;
\
grep
"^[^#;]"
requirements.apt |
\
grep
-Fv
"python3-dev"
|
\
xargs apt-get
install
-y
--no-install-recommends
;
\
rm
-rf
/usr/share/doc/
*
/usr/share/locale/
*
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
COPY
./requirements/base.txt /requirements/base.txt
RUN
pip
install
-r
/requirements/base.txt
...
...
This diff is collapsed.
Click to expand it.
api/docker/Dockerfile.test
+
6
−
3
View file @
8dea9130
FROM
python
:
3.5
ENV
PYTHONUNBUFFERED
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
RUN
apt
-
get
update
;
\
grep
"^[^#;]"
requirements
.
apt
|
\
grep
-
Fv
"python3-dev"
|
\
xargs
apt
-
get
install
-
y
--
no
-
install
-
recommends
;
\
rm
-
rf
/
usr
/
share
/
doc
/*
/
usr
/
share
/
locale
/*
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
mkdir
/
requirements
...
...
This diff is collapsed.
Click to expand it.
api/requirements.apt
+
3
−
6
View file @
8dea9130
build-essential
gettext
zlib1g-dev
curl
ffmpeg
libjpeg-dev
z
lib
1g
-dev
lib
magic
-dev
libpq-dev
postgresql-client
libmagic-dev
ffmpeg
python3-dev
curl
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