From 265e6eb3d47aa4966f36e664f1b0a2b38663f3f2 Mon Sep 17 00:00:00 2001
From: Jee <jee+funkwhale+dev@jeer.fr>
Date: Fri, 12 Apr 2019 10:50:12 +0200
Subject: [PATCH] Use network/depends_on instead of links in docker-compose.yml
(!716)
---
changes/changelog.d/compose.enhancement | 1 +
deploy/docker-compose.yml | 37 +++++++++++++++++--------
2 files changed, 27 insertions(+), 11 deletions(-)
create mode 100644 changes/changelog.d/compose.enhancement
diff --git a/changes/changelog.d/compose.enhancement b/changes/changelog.d/compose.enhancement
new file mode 100644
index 0000000000..bab1ca5e97
--- /dev/null
+++ b/changes/changelog.d/compose.enhancement
@@ -0,0 +1 @@
+Use network/depends_on instead of links in docker-compose.yml (!716)
\ No newline at end of file
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 89ab61c997..bcf24422f9 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -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:
--
GitLab