fix(settings/local): do not force by default, but specify explicitly
Adds tini as PID 1 to Django containers for them to react to signals. (init: true)
This commit is contained in:
parent
f24869ce3d
commit
5ea9ed3494
|
@ -2,6 +2,7 @@ COMPOSE_BAKE=true
|
||||||
|
|
||||||
# api + celeryworker
|
# api + celeryworker
|
||||||
DEBUG=True
|
DEBUG=True
|
||||||
|
FORCE=True
|
||||||
DEFAULT_FROM_EMAIL=hello@funkwhale.test
|
DEFAULT_FROM_EMAIL=hello@funkwhale.test
|
||||||
|
|
||||||
FUNKWHALE_DOMAIN=funkwhale.test
|
FUNKWHALE_DOMAIN=funkwhale.test
|
||||||
|
|
|
@ -154,4 +154,4 @@ REST_FRAMEWORK.update(
|
||||||
)
|
)
|
||||||
|
|
||||||
# allows makemigrations and superuser creation
|
# allows makemigrations and superuser creation
|
||||||
FORCE = env("FORCE", default=1)
|
FORCE = env("FORCE", default=0)
|
||||||
|
|
|
@ -1,22 +1,18 @@
|
||||||
x-django: &django
|
x-django: &django
|
||||||
image: funkwhale-api
|
image: funkwhale-api
|
||||||
|
init: true
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
volumes:
|
volumes:
|
||||||
- ../api:/app
|
- ../api:/app
|
||||||
- ../.env:/app/.env
|
|
||||||
- "${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:/music:ro"
|
- "${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:/music:ro"
|
||||||
- "../.state/plugins:/srv/funkwhale/plugins"
|
- "../.state/plugins:/srv/funkwhale/plugins"
|
||||||
- "../.state/staticfiles:/staticfiles"
|
- "../.state/staticfiles:/staticfiles"
|
||||||
- "../.state/media:/protected/media"
|
- "../.state/media:/protected/media"
|
||||||
- "../.state/${COMPOSE_PROJECT_NAME:-funkwhale}/media:/data/media"
|
- "../.state/${COMPOSE_PROJECT_NAME:-funkwhale}/media:/data/media"
|
||||||
depends_on:
|
|
||||||
postgres:
|
|
||||||
condition: service_healthy
|
|
||||||
redis:
|
|
||||||
condition: service_healthy
|
|
||||||
environment:
|
environment:
|
||||||
- DEBUG
|
- DEBUG
|
||||||
|
- FORCE
|
||||||
- DEFAULT_FROM_EMAIL
|
- DEFAULT_FROM_EMAIL
|
||||||
|
|
||||||
- DJANGO_SETTINGS_MODULE
|
- DJANGO_SETTINGS_MODULE
|
||||||
|
|
Loading…
Reference in New Issue