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

See #880: allow using a production-builded frontend in dev to test CSP

This commit is contained in:
Eliot Berriot 2019-07-10 14:58:20 +02:00
parent ab73752f55
commit c39cd010d5
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev.yml
View File

@ -119,6 +119,7 @@ services:
- "${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" - "${MEDIA_ROOT-./api/funkwhale_api/media}:/protected/media:ro"
- "./front:/frontend:ro"
networks: networks:
- federation - federation
- internal - internal

3
docker/nginx/conf.dev
View File

@ -70,6 +70,9 @@ http {
text/x-cross-domain-policy; text/x-cross-domain-policy;
location /front/ { location /front/ {
# uncomment the following line and comment the proxy-pass one
# to use the frontend build with "yarn build"
#alias /frontend/dist/;
proxy_pass http://funkwhale-front/front/; proxy_pass http://funkwhale-front/front/;
} }
location /front-server/ { location /front-server/ {