Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zwordi
funkwhale
Commits
0a71d160
Verified
Commit
0a71d160
authored
5 years ago
by
Eliot Berriot
Browse files
Options
Downloads
Patches
Plain Diff
Fixed some issues with staticfiles not being served in dev after switch to uvicorn
parent
5b7fad0b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dev.yml
+6
-1
6 additions, 1 deletion
dev.yml
docker/nginx/conf.dev
+3
-0
3 additions, 0 deletions
docker/nginx/conf.dev
with
9 additions
and
1 deletion
dev.yml
+
6
−
1
View file @
0a71d160
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
docker/nginx/conf.dev
+
3
−
0
View file @
0a71d160
...
...
@@ -136,5 +136,8 @@ http {
internal;
alias /music;
}
location /staticfiles/ {
alias /staticfiles/;
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment