unbork the templating
This commit is contained in:
parent
5f86631d43
commit
f042c460bf
40
compose.yml
40
compose.yml
|
@ -1,25 +1,23 @@
|
|||
---
|
||||
version: "3.8"
|
||||
|
||||
x-environment:
|
||||
&default-env:
|
||||
- CACHE_URL="redis://cache:6379/0"
|
||||
- CELERYD_CONCURRENCY
|
||||
- C_FORCE_ROOT=true
|
||||
- DATABASE_PASSWORD_FILE=/run/secrets/db_password
|
||||
- DJANGO_SECRET_KEY_FILE=/run/secrets/django_secret_key
|
||||
- DJANGO_SETTINGS_MODULE
|
||||
- DOMAIN
|
||||
- FUNKWHALE_HOSTNAME
|
||||
- FUNKWHALE_WEB_WORKERS
|
||||
- LOGLEVEL
|
||||
- REVERSE_PROXY_TYPE
|
||||
- STACK_NAME
|
||||
x-environment: &default-env
|
||||
- CACHE_URL="redis://cache:6379/0"
|
||||
- CELERYD_CONCURRENCY
|
||||
- C_FORCE_ROOT=true
|
||||
- DATABASE_PASSWORD_FILE=/run/secrets/db_password
|
||||
- DJANGO_SECRET_KEY_FILE=/run/secrets/django_secret_key
|
||||
- DJANGO_SETTINGS_MODULE
|
||||
- DOMAIN
|
||||
- FUNKWHALE_HOSTNAME
|
||||
- FUNKWHALE_WEB_WORKERS
|
||||
- LOGLEVEL
|
||||
- REVERSE_PROXY_TYPE
|
||||
- STACK_NAME
|
||||
|
||||
x-secrets:
|
||||
&default-sec:
|
||||
- db_password
|
||||
- django_secret_key
|
||||
x-secrets: &default-secrets
|
||||
- db_password
|
||||
- django_secret_key
|
||||
|
||||
services:
|
||||
app:
|
||||
|
@ -51,7 +49,7 @@ services:
|
|||
- redis
|
||||
command: celery -A funkwhale_api.taskapp worker -l INFO
|
||||
environment: *default-env
|
||||
secrets: *default-sec
|
||||
secrets: *default-secrets
|
||||
volumes:
|
||||
- music-data:/srv/funkwhale/data/music:ro
|
||||
- media-data:/srv/funkwhale/data/media
|
||||
|
@ -61,7 +59,7 @@ services:
|
|||
celerybeat:
|
||||
image: funkwhale/funkwhale:1.2
|
||||
environment: *default-env
|
||||
secrets: *default-sec
|
||||
secrets: *default-secrets
|
||||
depends_on:
|
||||
- postgres
|
||||
- redis
|
||||
|
@ -72,7 +70,7 @@ services:
|
|||
api:
|
||||
image: funkwhale/funkwhale:1.2
|
||||
environment: *default-env
|
||||
secrets: *default-sec
|
||||
secrets: *default-secrets
|
||||
depends_on:
|
||||
- postgres
|
||||
- redis
|
||||
|
|
Loading…
Reference in New Issue