MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issues with images not being served in dev

This commit is contained in:
Eliot Berriot 2019-07-16 17:32:35 +02:00
parent 31329d81dd
commit 3e9bda24e1
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev.yml
View File

@ -57,6 +57,7 @@ services:
- "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro" - "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro"
- "./data/plugins:/srv/funkwhale/plugins" - "./data/plugins:/srv/funkwhale/plugins"
- "./data/staticfiles:/staticfiles" - "./data/staticfiles:/staticfiles"
- "./data/media:/data/media"
environment: environment:
- "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-localhost}" - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-localhost}"
- "FUNKWHALE_HOSTNAME_SUFFIX=funkwhale.test" - "FUNKWHALE_HOSTNAME_SUFFIX=funkwhale.test"
@ -65,6 +66,7 @@ services:
- "DATABASE_URL=postgresql://postgres@postgres/postgres" - "DATABASE_URL=postgresql://postgres@postgres/postgres"
- "CACHE_URL=redis://redis:6379/0" - "CACHE_URL=redis://redis:6379/0"
- "STATIC_ROOT=/staticfiles" - "STATIC_ROOT=/staticfiles"
- "MEDIA_ROOT=/data/media"
depends_on: depends_on:
- postgres - postgres
@ -92,10 +94,12 @@ services:
- "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL-http}" - "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL-http}"
- "DATABASE_URL=postgresql://postgres@postgres/postgres" - "DATABASE_URL=postgresql://postgres@postgres/postgres"
- "CACHE_URL=redis://redis:6379/0" - "CACHE_URL=redis://redis:6379/0"
- "MEDIA_ROOT=/data/media"
volumes: volumes:
- ./api:/app - ./api:/app
- "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro" - "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro"
- "./data/plugins:/srv/funkwhale/plugins" - "./data/plugins:/srv/funkwhale/plugins"
- "./data/media:/data/media"
networks: networks:
- internal - internal
nginx: nginx:
@ -122,9 +126,9 @@ services:
- ./docker/nginx/entrypoint.sh:/entrypoint.sh:ro - ./docker/nginx/entrypoint.sh:/entrypoint.sh:ro
- "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro" - "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro"
- ./deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro - ./deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro
- "${MEDIA_ROOT-./api/funkwhale_api/media}:/protected/media:ro"
- "./front:/frontend:ro" - "./front:/frontend:ro"
- "./data/staticfiles:/staticfiles:ro" - "./data/staticfiles:/staticfiles:ro"
- "./data/media:/protected/media:ro"
networks: networks:
- federation - federation
- internal - internal