diff --git a/.gitignore b/.gitignore index 7a87922..bb2492e 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,9 @@ src/frontend/tsclient # Logs *.log +# Celery beat +src/backend/celerybeat-schedule + # Test & lint .coverage coverage.json diff --git a/CHANGELOG.md b/CHANGELOG.md index fa3d127..9e8289b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to ### Added +- 🧑‍💻(docker) add celery beat to manage periodic tasks - ✨(organization) add metadata field #790 - ⬆️(nginx) bump nginx-unprivileged to 1.27 #797 - ✨(teams) allow broadly available teams #796 diff --git a/Makefile b/Makefile index cebc85f..babf3cd 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,7 @@ run: ## start the wsgi (production) and development server @$(COMPOSE) up --force-recreate -d nginx @$(COMPOSE) up --force-recreate -d app-dev @$(COMPOSE) up --force-recreate -d celery-dev + @$(COMPOSE) up --force-recreate -d celery-beat-dev @$(COMPOSE) up --force-recreate -d keycloak @$(COMPOSE) up -d dimail @echo "Wait for postgresql to be up..." diff --git a/docker-compose.yml b/docker-compose.yml index 6e6bebd..87cdb6c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -57,6 +57,22 @@ services: depends_on: - app-dev + celery-beat-dev: + user: ${DOCKER_USER:-1000} + image: people:backend-development + command: ["celery", "-A", "people.celery_app", "beat", "-l", "DEBUG"] + environment: + - DJANGO_CONFIGURATION=Development + env_file: + - env.d/development/common + - env.d/development/postgresql + volumes: + - ./src/backend:/app + - ./data/media:/data/media + - ./data/static:/data/static + depends_on: + - app-dev + app: build: context: .