From 42dcb0d4cb119ecaac824fb1cace1fb011075b5e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 25 Mar 2016 02:50:48 +0100
Subject: Adding Sidekiq for background processing (firstly just of mailers)

---
 docker-compose.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index ed29808b0..b3b233713 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,8 +4,11 @@ services:
     image: postgres
   redis:
     image: redis
-  web:
+  app:
     build: .
+    env_file: .env.production
+  web:
+    extends: app
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
     ports:
       - "3000:3000"
@@ -15,4 +18,11 @@ services:
     volumes:
       - ./public/assets:/mastodon/public/assets
       - ./public/system:/mastodon/public/system
-    env_file: .env.production
+  sidekiq:
+    extends: app
+    command: bundle exec sidekiq -q default -q mailers
+    depends_on:
+      - db
+      - redis
+    volumes:
+      - ./public/system:/mastodon/public/system
-- 
cgit