Merge branch 'fix-port-binding-issues-in-dev' into 'develop'

Fix port binding issues in dev

See merge request funkwhale/funkwhale!669

CONTRIBUTING.rst

@@ -280,7 +280,8 @@ When working on federation with traefik, ensure you have this in your ``env``::
     EXTERNAL_REQUESTS_VERIFY_SSL=false
     # this ensure you don't have incorrect urls pointing to http resources
     FUNKWHALE_PROTOCOL=https
-
+    # Disable host ports binding for the nginx container, as traefik is serving everything
+    NGINX_PORTS_MAPPING=80
 
 Typical workflow for a contribution
 -----------------------------------

dev.yml

@@ -60,6 +60,8 @@ services:
       - "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL-http}"
       - "DATABASE_URL=postgresql://postgres@postgres/postgres"
       - "CACHE_URL=redis://redis:6379/0"
+      - "FUNKWHALE_SPA_HTML_ROOT=http://nginx/front/"
+
     links:
       - postgres
       - redis
@@ -95,6 +97,8 @@ services:
       - .env.dev
       - .env
     image: nginx
+    ports:
+      - "${NGINX_PORTS_MAPPING-8000:80}"
     environment:
       - "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-100M}"
       - "FUNKWHALE_API_IP=${FUNKHALE_API_IP-api}"