From 0a71d160a5319ade9143b3cbc1a30b7a2fe328f8 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 18 Jul 2019 12:51:57 +0200
Subject: [PATCH] Fixed some issues with staticfiles not being served in dev
after switch to uvicorn
---
dev.yml | 7 ++++++-
docker/nginx/conf.dev | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dev.yml b/dev.yml
index 4a61a7a8..b0ca7fc7 100644
--- a/dev.yml
+++ b/dev.yml
@@ -49,11 +49,14 @@ services:
args:
install_dev_deps: 1
entrypoint: compose/django/dev-entrypoint.sh
- command: uvicorn --reload config.asgi:application --host 0.0.0.0 --port 5000 --reload-dir config/ --reload-dir=funkwhale_api/
+ command: >
+ bash -c "python manage.py collectstatic --no-input
+ && uvicorn --reload config.asgi:application --host 0.0.0.0 --port 5000 --reload-dir config/ --reload-dir=funkwhale_api/"
volumes:
- ./api:/app
- "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro"
- "./data/plugins:/srv/funkwhale/plugins"
+ - "./data/staticfiles:/staticfiles"
environment:
- "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-localhost}"
- "FUNKWHALE_HOSTNAME_SUFFIX=funkwhale.test"
@@ -61,6 +64,7 @@ services:
- "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL-http}"
- "DATABASE_URL=postgresql://postgres@postgres/postgres"
- "CACHE_URL=redis://redis:6379/0"
+ - "STATIC_ROOT=/staticfiles"
depends_on:
- postgres
@@ -120,6 +124,7 @@ services:
- ./deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro
- "${MEDIA_ROOT-./api/funkwhale_api/media}:/protected/media:ro"
- "./front:/frontend:ro"
+ - "./data/staticfiles:/staticfiles:ro"
networks:
- federation
- internal
diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev
index 976c2e43..95560b6d 100644
--- a/docker/nginx/conf.dev
+++ b/docker/nginx/conf.dev
@@ -136,5 +136,8 @@ http {
internal;
alias /music;
}
+ location /staticfiles/ {
+ alias /staticfiles/;
+ }
}
}
--
GitLab