parametrize the volumes
This commit is contained in:
parent
d2627eab32
commit
caaef320a3
23
compose.yml
23
compose.yml
|
@ -24,18 +24,20 @@ x-secrets: &default-secrets
|
|||
- db_password
|
||||
- django_secret_key
|
||||
|
||||
x-volumes: &default-volumes
|
||||
- music-data:/srv/funkwhale/data/music:ro
|
||||
- media-data:/srv/funkwhale/data/media
|
||||
- static-data:/srv/funkwhale/data/static
|
||||
- frontend-data:/srv/funkwhale/front/dist:ro
|
||||
|
||||
services:
|
||||
app:
|
||||
image: nginx:1.20.0
|
||||
environment: *default-env
|
||||
volumes: *default-volumes
|
||||
configs:
|
||||
- source: nginx_config
|
||||
target: /etc/nginx/nginx.conf
|
||||
volumes:
|
||||
- music-data:/srv/funkwhale/data/music:ro
|
||||
- media-data:/srv/funkwhale/data/media
|
||||
- static-data:/srv/funkwhale/data/static
|
||||
- frontend-data:/srv/funkwhale/front/dist:ro
|
||||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
|
@ -57,15 +59,13 @@ services:
|
|||
- cache
|
||||
environment: *default-env
|
||||
secrets: *default-secrets
|
||||
volumes: *default-volumes
|
||||
configs:
|
||||
- source: app_entrypoint
|
||||
target: /docker-entrypoint.sh
|
||||
mode: 0555
|
||||
entrypoint: /docker-entrypoint.sh
|
||||
command: celery -A funkwhale_api.taskapp worker -l INFO
|
||||
volumes:
|
||||
- music-data:/srv/funkwhale/data/music:ro
|
||||
- media-data:/srv/funkwhale/data/media
|
||||
networks:
|
||||
- internal
|
||||
|
||||
|
@ -73,6 +73,7 @@ services:
|
|||
image: funkwhale/funkwhale:1.2
|
||||
environment: *default-env
|
||||
secrets: *default-secrets
|
||||
volumes: *default-volumes
|
||||
depends_on:
|
||||
- db
|
||||
- cache
|
||||
|
@ -89,14 +90,10 @@ services:
|
|||
image: funkwhale/funkwhale:1.2
|
||||
environment: *default-env
|
||||
secrets: *default-secrets
|
||||
volumes: *default-volumes
|
||||
depends_on:
|
||||
- db
|
||||
- cache
|
||||
volumes:
|
||||
- music-data:/srv/funkwhale/data/music:ro
|
||||
- media-data:/srv/funkwhale/data/media
|
||||
- static-data:/srv/funkwhale/data/static
|
||||
- frontend-data:/srv/funkwhale/front/dist
|
||||
configs:
|
||||
- source: app_entrypoint
|
||||
target: /docker-entrypoint.sh
|
||||
|
|
Loading…
Reference in New Issue