From 32018e9e78ad322604dcc164ad1f397a084847d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <b.baedorf@openproject.com>
Date: Wed, 4 Aug 2021 10:52:57 +0200
Subject: [PATCH] Add worker container to development setup

---
 docker-compose.yml | 48 ++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 983c6c83a95..030a771abb5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,34 +32,44 @@ x-op-frontend-build: &frontend-build
   args:
     DEV_UID: $DEV_UID
     DEV_GID: $DEV_GID
+x-op-backend: &backend
+  build:
+    <<: *build
+    target: develop
+  <<: *image
+  <<: *restart_policy
+  environment:
+    LOCAL_DEV_CHECK: "${LOCAL_DEV_CHECK:?The docker-compose file for OpenProject has moved to https://github.com/opf/openproject-deploy}"
+    RAILS_ENV: development
+    RAILS_CACHE_STORE: file_store
+    OPENPROJECT_CACHE__MEMCACHE__SERVER: cache:11211
+    OPENPROJECT_RAILS__RELATIVE__URL__ROOT: "${OPENPROJECT_RAILS__RELATIVE__URL__ROOT:-}"
+    DATABASE_URL: postgresql://${DB_USERNAME:-postgres}:${DB_PASSWORD:-postgres}@${DB_HOST:-db}:${DB_PORT:-5432}/${DB_DATABASE:-openproject}
+  volumes:
+    - ".:/home/dev/openproject"
+    - "opdata:/var/openproject/assets"
+    - "bundle:/usr/local/bundle"
+    - "tmp:/home/dev/openproject/tmp"
+  networks:
+    - network
 
 services:
   backend:
-    build:
-      <<: *build
-      target: develop
-    <<: *image
-    <<: *restart_policy
+    <<: *backend
     command: run-app
     ports:
       - "3000:3000"
-    environment:
-      LOCAL_DEV_CHECK: "${LOCAL_DEV_CHECK:?The docker-compose file for OpenProject has moved to https://github.com/opf/openproject-deploy}"
-      RAILS_ENV: development
-      RAILS_CACHE_STORE: file_store
-      OPENPROJECT_CACHE__MEMCACHE__SERVER: cache:11211
-      OPENPROJECT_RAILS__RELATIVE__URL__ROOT: "${OPENPROJECT_RAILS__RELATIVE__URL__ROOT:-}"
-      DATABASE_URL: postgresql://${DB_USERNAME:-postgres}:${DB_PASSWORD:-postgres}@${DB_HOST:-db}:${DB_PORT:-5432}/${DB_DATABASE:-openproject}
-    volumes:
-      - ".:/home/dev/openproject"
-      - "opdata:/var/openproject/assets"
-      - "bundle:/usr/local/bundle"
-      - "tmp:/home/dev/openproject/tmp"
     depends_on:
       - db
       - cache
-    networks:
-      - network
+      - worker
+
+  worker:
+    <<: *backend
+    command: bundle exec rake jobs:work
+    depends_on:
+      - db
+      - cache
 
   frontend:
     build: