From 3c0d654db463b5c8fa5cab5cb8805610de973a7f Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Tue, 14 Apr 2020 14:44:48 +0200
Subject: [PATCH] Use entrypoint.sh for celery worker and scheduler
---
docker-compose.yml | 4 ++--
docker/entrypoint.sh | 8 ++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index ca3150e46..9ea7d1084 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,7 +31,7 @@ services:
volumes:
- aleksis_data:/var/lib/aleksis/
- aleksis_static:/usr/share/aleksis/static/
- entrypoint: ["celery", "-A", "aleksis.core", "worker", "-l", "info"]
+ entrypoint: ["/usr/local/bin/entrypoint.sh", "celery_worker"]
environment:
- ALEKSIS_http__allowed_hosts="['*']"
- ALEKSIS_caching__memcached__address=memcached:11211
@@ -46,7 +46,7 @@ services:
volumes:
- aleksis_data:/var/lib/aleksis/
- aleksis_static:/usr/share/aleksis/static/
- entrypoint: ["celery", "-A", "aleksis.core", "beat", "-l", "info", "--scheduler", "django_celery_beat.schedulers:DatabaseScheduler"]
+ entrypoint: ["/usr/local/bin/entrypoint.sh", "celery_beat"]
environment:
- ALEKSIS_http__allowed_hosts="['*']"
- ALEKSIS_caching__memcached__address=memcached:11211
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index d66dbdd77..8c9c64e55 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -21,8 +21,12 @@ python manage.py compilescss
python manage.py collectstatic --no-input --clear
python manage.py migrate
-if [[ -n "$@" ]]; then
- exec "$@"
+ARG=${$1:-"gunicorn"}
+
+if [ $ARG = "celery_worker" ]; then
+ exec celery -A aleksis.core worker -l info
+elif [ $ARG = "celery_beat" ]; then
+ exec celery -A aleksis.core beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
else
exec gunicorn aleksis.core.wsgi --bind ${GUNICORN_BIND}
fi
--
GitLab