Merge branch 'patch-1' into 'develop'

docker-compose: fix music dir being mounted in the wrong place for nginx

See merge request funkwhale/funkwhale!1128
environments/review-docs-devel-1399dq/deployments/6607
Agate 2021-02-11 08:36:33 +01:00
commit b91c48a6ce
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -88,7 +88,7 @@ services:
volumes:
- "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro"
- "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro"
- "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:ro"
- "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro"
- "${MEDIA_ROOT}:${MEDIA_ROOT}:ro"
- "${STATIC_ROOT}:${STATIC_ROOT}:ro"
- "${FUNKWHALE_FRONTEND_PATH}:/frontend:ro"