Fix celery container

docker-compose.yml

@@ -69,6 +69,7 @@ services:
       context: ./rapidpro/
       args:
         - RAPIDPRO_TAG=v9.2.5
+    command: ["webapp"]
     depends_on:
       postgres:
         condition: service_healthy
@@ -82,17 +83,18 @@ services:
       - 8000:8000
     healthcheck:
       test: curl -s http://localhost:8000 >/dev/null || exit 1
-      interval: 20s
+      interval: 15s
       timeout: 5s
       retries: 5
+      start_period: 20s
 
   celery:
     image: nyaruka/rapidpro:stable
-    command: ["/venv/bin/celery", "--beat", "--app=temba", "worker", "--loglevel=INFO", "--queues=celery"]
     build:
       context: ./rapidpro/
       args:
         - RAPIDPRO_TAG=v9.2.5
+    command: ["celery"]
     depends_on:
       rapidpro:
         condition: service_healthy

rapidpro/Dockerfile

@@ -6,6 +6,7 @@ ENV RAPIDPRO_TAG=${RAPIDPRO_TAG:-main}
 RUN apt-get update && apt-get install -y libgdal-dev ffmpeg nodejs npm
 RUN curl -sSL https://install.python-poetry.org | python3 -
 ENV PATH="/root/.local/bin:$PATH"
+ENV POETRY_VIRTUALENVS_IN_PROJECT=true
 RUN npm install -g n && n 20
 RUN npm install -g yarn less
 
@@ -18,4 +19,4 @@ RUN ln -s /rapidpro/temba/settings.py.dev /rapidpro/temba/settings.py
 EXPOSE 8000
 COPY entrypoint.sh /rapidpro/
 RUN chmod +x /rapidpro/entrypoint.sh
-ENTRYPOINT ["/rapidpro/entrypoint.sh"] 
+ENTRYPOINT ["/rapidpro/entrypoint.sh"]

rapidpro/entrypoint.sh

@@ -2,5 +2,13 @@
 
 export REMOTE_CONTAINERS=true
 
-poetry run python3 manage.py migrate
-poetry run python3 manage.py runserver 0.0.0.0:8000
+ACTION=${1:-webapp}
+
+if [ "$ACTION" = "webapp" ]; then
+    echo "Running RapidPro webapp..."
+	poetry run python3 manage.py migrate
+    poetry run python3 manage.py runserver 0.0.0.0:8000
+elif [ "$ACTION" = "celery" ]; then
+    echo "Running RapidPro celery worker..."
+	.venv/bin/celery -A temba worker -E -B --loglevel=INFO
+fi