Removing separate celerybeat container and using unified celery+celerybeat container.

ansible/roles/celery_task/tasks/main.yml

@@ -43,7 +43,7 @@
     - container_name: task-celery
       command: "celery worker -A newsblur_web --loglevel=INFO -Q new_feeds,push_feeds,update_feeds,search_indexer" 
     - container_name: task-work
-      command: "celery worker -A newsblur_web --loglevel=INFO -Q beat_feeds_task,work_queue,cron_queue"
+      command: "celery worker -A newsblur_web --loglevel=INFO -B -s /srv/newsblur/logs/celerybeat-schedule.db -Q beat_feeds_task,work_queue,cron_queue"
   tags:
     - start
 

docker-compose.yml

@@ -121,21 +121,11 @@ services:
     command: mongod --smallfiles --port 29019
     volumes:
       - ./docker/volumes/db_mongo:/data/db
-  
-  celerybeat:
-    container_name: celerybeat
-    image: newsblur/newsblur_python3
-    command: bash -c "mkdir -p data && celery beat -A newsblur_web --schedule=/srv/newsblur/data/celerybeat-schedule.db --loglevel=INFO --pidfile=/srv/celeryd.pid"
-    environment: 
-      - DOCKERBUILD=True
-    volumes:
-      - ${PWD}:/srv/newsblur
-      - ./config:/etc/supervisor/conf.d/
 
   task_celery:
     container_name: task_celery
     image: newsblur/newsblur_python3
-    command: "celery worker -A newsblur_web --loglevel=INFO"
+    command: "celery worker -A newsblur_web -B --loglevel=INFO"
     volumes:
       - ${PWD}:/srv/newsblur
     environment: 
@@ -175,4 +165,4 @@ services:
     - ./docker/netdata/netdataconfig/netdata.conf.j2:/etc/netdata/netdata.conf
     - ./docker/netdata/netdataconfig/python.d.conf:/usr/lib/netdata/conf.d/python.d.conf 
     - ./docker/netdata/netdataconfig/conf/:/usr/lib/netdata/conf.d/python.d/
-    - ./docker/netdata/netdataconfig/charts/newsblur.chart.py:/usr/libexec/netdata/python.d/newsblur.chart.py
+    - ./docker/netdata/netdataconfig/charts/newsblur.chart.py:/usr/libexec/netdata/python.d/newsblur.chart.py