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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Philipp Wolfer
funkwhale
Commits
265e6eb3
Commit
265e6eb3
authored
5 years ago
by
Jee
💬
Committed by
Eliot Berriot
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Use network/depends_on instead of links in docker-compose.yml (!716)
parent
4d55c844
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changes/changelog.d/compose.enhancement
+1
-0
1 addition, 0 deletions
changes/changelog.d/compose.enhancement
deploy/docker-compose.yml
+26
-11
26 additions, 11 deletions
deploy/docker-compose.yml
with
27 additions
and
11 deletions
changes/changelog.d/compose.enhancement
0 → 100644
+
1
−
0
View file @
265e6eb3
Use network/depends_on instead of links in docker-compose.yml (!716)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
deploy/docker-compose.yml
+
26
−
11
View file @
265e6eb3
...
...
@@ -3,6 +3,8 @@ version: "3"
services
:
postgres
:
restart
:
unless-stopped
networks
:
-
default
env_file
:
.env
image
:
postgres:11
volumes
:
...
...
@@ -10,6 +12,8 @@ services:
redis
:
restart
:
unless-stopped
networks
:
-
default
env_file
:
.env
image
:
redis:3
volumes
:
...
...
@@ -18,6 +22,11 @@ services:
celeryworker
:
restart
:
unless-stopped
image
:
funkwhale/funkwhale:${FUNKWHALE_VERSION:-latest}
networks
:
-
default
depends_on
:
-
postgres
-
redis
env_file
:
.env
# Celery workers handle background tasks (such file imports or federation
# messaging). The more processes a worker gets, the more tasks
...
...
@@ -28,9 +37,6 @@ services:
# flag:
# celery -A funkwhale_api.taskapp worker -l INFO --concurrency=4
command
:
celery -A funkwhale_api.taskapp worker -l INFO
links
:
-
postgres
-
redis
environment
:
-
C_FORCE_ROOT=true
volumes
:
...
...
@@ -40,15 +46,22 @@ services:
celerybeat
:
restart
:
unless-stopped
image
:
funkwhale/funkwhale:${FUNKWHALE_VERSION:-latest}
env_file
:
.env
command
:
celery -A funkwhale_api.taskapp beat -l INFO
links
:
networks
:
-
default
depends_on
:
-
postgres
-
redis
env_file
:
.env
command
:
celery -A funkwhale_api.taskapp beat -l INFO
api
:
restart
:
unless-stopped
image
:
funkwhale/funkwhale:${FUNKWHALE_VERSION:-latest}
networks
:
-
default
depends_on
:
-
postgres
-
redis
env_file
:
.env
volumes
:
-
"
${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro"
...
...
@@ -57,13 +70,14 @@ services:
-
"
${FUNKWHALE_FRONTEND_PATH}:/frontend"
ports
:
-
"
5000"
links
:
-
postgres
-
redis
nginx
:
restart
:
unless-stopped
image
:
nginx
networks
:
-
default
depends_on
:
-
api
env_file
:
-
.env
environment
:
...
...
@@ -85,5 +99,6 @@ services:
> /etc/nginx/conf.d/default.conf
&& cat /etc/nginx/conf.d/default.conf
&& nginx -g 'daemon off;'"
links
:
-
api
networks
:
default
:
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