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

Fix port binding issues in dev

This commit is contained in:
Eliot Berriot 2019-03-13 10:20:57 +01:00
parent 9a14be9c47
commit 2561d9d114
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTING.rst
View File

@ -280,7 +280,8 @@ When working on federation with traefik, ensure you have this in your ``env``::
EXTERNAL_REQUESTS_VERIFY_SSL=false EXTERNAL_REQUESTS_VERIFY_SSL=false
# this ensure you don't have incorrect urls pointing to http resources # this ensure you don't have incorrect urls pointing to http resources
FUNKWHALE_PROTOCOL=https 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 Typical workflow for a contribution
----------------------------------- -----------------------------------

4
dev.yml
View File

@ -60,6 +60,8 @@ 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"
- "FUNKWHALE_SPA_HTML_ROOT=http://nginx/front/"
links: links:
- postgres - postgres
- redis - redis
@ -95,6 +97,8 @@ services:
- .env.dev - .env.dev
- .env - .env
image: nginx image: nginx
ports:
- "${NGINX_PORTS_MAPPING-8000:80}"
environment: environment:
- "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-100M}" - "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-100M}"
- "FUNKWHALE_API_IP=${FUNKHALE_API_IP-api}" - "FUNKWHALE_API_IP=${FUNKHALE_API_IP-api}"