From c39cd010d54c99b7b32014417d183042102fbe10 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 10 Jul 2019 14:58:20 +0200
Subject: [PATCH] See #880: allow using a production-builded frontend in dev to
test CSP
---
dev.yml | 1 +
docker/nginx/conf.dev | 3 +++
2 files changed, 4 insertions(+)
diff --git a/dev.yml b/dev.yml
index f95b9b5f6d..4a61a7a87c 100644
--- a/dev.yml
+++ b/dev.yml
@@ -119,6 +119,7 @@ services:
- "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro"
- ./deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro
- "${MEDIA_ROOT-./api/funkwhale_api/media}:/protected/media:ro"
+ - "./front:/frontend:ro"
networks:
- federation
- internal
diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev
index 8b6eb4d8cb..0ab9ec160d 100644
--- a/docker/nginx/conf.dev
+++ b/docker/nginx/conf.dev
@@ -70,6 +70,9 @@ http {
text/x-cross-domain-policy;
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/;
}
location /front-server/ {
--
GitLab