Upgraded to Celery4

Dockerfile

@@ -42,7 +42,9 @@ COPY . "${KOBOCAT_SRC_DIR}"
 RUN mkdir -p /etc/service/uwsgi && \
     cp "${KOBOCAT_SRC_DIR}/docker/run_uwsgi.bash" /etc/service/uwsgi/run && \
     mkdir -p /etc/service/celery && \
-    cp "${KOBOCAT_SRC_DIR}/docker/run_celery.bash" /etc/service/celery/run && \
+    ln -s "${KOBOCAT_SRC_DIR}/docker/run_celery.bash" /etc/service/celery/run && \
+    mkdir -p /etc/service/celery_beat && \
+    ln -s "${KOBOCAT_SRC_DIR}/docker/run_celery_beat.bash" /etc/service/celery_beat/run && \
     cp "${KOBOCAT_SRC_DIR}/docker/init.bash" /etc/my_init.d/10_init_kobocat.bash && \
     cp "${KOBOCAT_SRC_DIR}/docker/sync_static.sh" /etc/my_init.d/11_sync_static.bash && \
     mkdir -p "${KOBOCAT_SRC_DIR}/emails/" && \

docker/run_celery.bash

@@ -1,10 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
-
 source /etc/profile
 
-CELERYD_OPTIONS="-Ofair --beat --loglevel=DEBUG"
-
+# Run the main Celery worker
 cd "${KOBOCAT_SRC_DIR}"
-
-exec /sbin/setuser "${UWSGI_USER}" python manage.py celeryd $CELERYD_OPTIONS
+exec celery worker -A onadata --loglevel=debug \
+    --hostname=main_worker@%h \
+    --logfile=${KOBOCAT_LOGS_DIR}/celery.log \
+    --pidfile=/tmp/celery.pid

docker/run_celery_beat.bash

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+source /etc/profile
+
+# Run the main Celery beat worker
+cd "${KOBOCAT_SRC_DIR}"
+exec celery beat -A onadata --loglevel=debug \
+    --logfile=${KOBOCAT_LOGS_DIR}/celery_beat.log \
+    --pidfile=/tmp/celery_beat.pid \
+    --scheduler django_celery_beat.schedulers:DatabaseScheduler