From 26295c08f7307dfd12d6b53b524e8484b7af6b27 Mon Sep 17 00:00:00 2001 From: ArneBo Date: Tue, 1 Oct 2024 12:43:22 +0200 Subject: [PATCH] Feat(compose): Add migrate container co-authored-by: upsiflu@gmail.com co-authored-by: jon@allmende.io --- docker/app.django.yml | 10 ++++++++++ docker/env.federation.yml | 6 ++++++ docker/env.local.yml | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/docker/app.django.yml b/docker/app.django.yml index a0130574b..12eebd733 100644 --- a/docker/app.django.yml +++ b/docker/app.django.yml @@ -23,10 +23,20 @@ services: dockerfile: Dockerfile args: install_dev_deps: 1 + depends_on: + migrate: + condition: service_completed_successfully command: > bash -c "funkwhale-manage collectstatic --no-input && uvicorn --reload config.asgi:application --host 0.0.0.0 --port 5000 --reload-dir config/ --reload-dir=funkwhale_api/" celeryworker: <<: *django + depends_on: + migrate: + condition: service_completed_successfully command: celery -A funkwhale_api.taskapp worker -l debug -B --concurrency=${CELERYD_CONCURRENCY} + + migrate: + <<: *django + command: funkwhale-manage migrate diff --git a/docker/env.federation.yml b/docker/env.federation.yml index 7c0b69de3..0f01ae555 100644 --- a/docker/env.federation.yml +++ b/docker/env.federation.yml @@ -50,6 +50,12 @@ services: service: celeryworker <<: *federation + migrate: + extends: + file: ./app.django.yml + service: migrate + <<: *federation + nginx: extends: file: ./app.nginx.yml diff --git a/docker/env.local.yml b/docker/env.local.yml index 8e4793506..d1f8f182d 100644 --- a/docker/env.local.yml +++ b/docker/env.local.yml @@ -44,6 +44,12 @@ services: service: celeryworker <<: *local + migrate: + extends: + file: ./app.django.yml + service: migrate + <<: *local + nginx: extends: file: ./app.nginx.yml