about summary refs log tree commit diff
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-25 02:50:48 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-25 02:50:48 +0100
commit42dcb0d4cb119ecaac824fb1cace1fb011075b5e (patch)
tree49431aa95bbe2bc1c32129dc3e4c04d555e09ccc /docker-compose.yml
parenta08e724476f47b85de9bb334eeadaf882a7a23ee (diff)
Adding Sidekiq for background processing (firstly just of mailers)
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml14
1 files changed, 12 insertions, 2 deletions
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