Merge pull request #677 from mstriemer/celery-docker

Support rabbitmq/celery with docker
mozilla · Aug 26, 2015 · 10d9001 · 10d9001
2 parents 74a7f32 + e62be17
commit 10d9001
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,16 +1,15 @@
-web:
+worker: &worker
   build: .
-  command: python manage.py runserver 0.0.0.0:8000
+  command: ./manage.py celeryd
   entrypoint: ./scripts/start-docker.sh
-  ports:
-    - "8000:8000"
   volumes:
     - .:/code
   links:
-    - memcached:memcached
-    - mysqld:mysqld
-    - elasticsearch:elasticsearch
-    - redis:redis
+    - memcached
+    - mysqld
+    - elasticsearch
+    - redis
+    - rabbitmq
   environment:
     - DATABASE_URL=mysql://root:@mysqld/olympia
     - MEMCACHE_LOCATION=memcached:11211
@@ -19,6 +18,13 @@ web:
     - MYSQL_ROOT_PASSWORD='docker'
     - MYSQL_DATABASE='olympia'
     - PYTHONDONTWRITEBYTECODE=1
+    - BROKER_URL=amqp://olympia:olympia@rabbitmq/olympia
+
+web:
+  <<: *worker
+  command: python manage.py runserver 0.0.0.0:8000
+  ports:
+    - "8000:8000"
 
 memcached:
   image: memcached
@@ -34,3 +40,14 @@ elasticsearch:
 
 redis:
   image: redis
+
+rabbitmq:
+  image: rabbitmq
+  hostname: olympia
+  name: olympia
+  expose:
+    - "5672:5672"
+  environment:
+    - RABBITMQ_DEFAULT_USER=olympia
+    - RABBITMQ_DEFAULT_PASS=olympia
+    - RABBITMQ_DEFAULT_VHOST=olympia
diff --git a/lib/settings_base.py b/lib/settings_base.py
@@ -976,7 +976,8 @@ def JINJA_CONFIG():
 
 
 # Celery
-BROKER_URL = 'amqp://olympia:olympia@localhost:5672/olympia'
+BROKER_URL = os.environ.get('BROKER_URL',
+                            'amqp://olympia:olympia@localhost:5672/olympia')
 BROKER_CONNECTION_TIMEOUT = 0.1
 CELERY_RESULT_BACKEND = 'amqp'
 CELERY_IGNORE_RESULT = True