chore(compose): use canonical name for web service
This commit is contained in:
parent
855105b618
commit
afc15be3f0
10
.env.example
10
.env.example
|
@ -9,7 +9,7 @@ FUNKWHALE_DOMAIN=funkwhale.test
|
|||
FUNKWHALE_PROTOCOL=https
|
||||
|
||||
DJANGO_SECRET_KEY=dev
|
||||
DJANGO_ALLOWED_HOSTS=.funkwhale.test,nginx
|
||||
DJANGO_ALLOWED_HOSTS=.funkwhale.test,web
|
||||
DJANGO_SETTINGS_MODULE=config.settings.local
|
||||
|
||||
DATABASE_URL=postgresql://postgres@postgres/postgres
|
||||
|
@ -26,11 +26,11 @@ PYTHONTRACEMALLOC=0
|
|||
|
||||
# api
|
||||
|
||||
FUNKWHALE_SPA_HTML_ROOT=http://nginx/
|
||||
FUNKWHALE_SPA_HTML_ROOT=${FUNKWHALE_PROTOCOL}://${FUNKWHALE_DOMAIN}
|
||||
LDAP_ENABLED=False
|
||||
BROWSABLE_API_ENABLED=True
|
||||
|
||||
# api + nginx
|
||||
# api + web
|
||||
|
||||
STATIC_ROOT=/staticfiles
|
||||
MEDIA_ROOT=/data/media
|
||||
|
@ -38,12 +38,12 @@ MEDIA_ROOT=/data/media
|
|||
# api + Typesense
|
||||
TYPESENSE_API_KEY=apikey
|
||||
|
||||
# front
|
||||
# app
|
||||
|
||||
HOST=0.0.0.0
|
||||
VUE_PORT=8080
|
||||
|
||||
# nginx
|
||||
# web
|
||||
|
||||
NGINX_MAX_BODY_SIZE=10G
|
||||
|
||||
|
|
|
@ -30,10 +30,10 @@ services:
|
|||
service: worker
|
||||
<<: *django
|
||||
|
||||
nginx:
|
||||
web:
|
||||
extends:
|
||||
file: ./compose/app.nginx.yml
|
||||
service: nginx
|
||||
service: web
|
||||
depends_on:
|
||||
app:
|
||||
condition: service_healthy
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
services:
|
||||
nginx:
|
||||
web:
|
||||
image: nginx
|
||||
networks:
|
||||
- internal
|
||||
|
|
Loading…
Reference in New Issue