Merge pull request #5358 from jsangmeister/add-reader-to-dc

Add reader to docker compose files

docker-compose.dev.yml

@@ -1,9 +1,16 @@
 version: '3'
 services:
+    datastore-reader:
+        image: openslides-datastore-reader-dev
+        volumes:
+            - ./openslides-datastore-service/shared/shared:/app/shared
+            - ./openslides-datastore-service/reader/reader:/app/reader
     datastore-writer:
         image: openslides-datastore-writer-dev
         volumes:
+            - ./openslides-datastore-service/shared/shared:/app/shared
             - ./openslides-datastore-service/writer/writer:/app/writer
+            - ./cli:/app/cli
     haproxy:
         image: openslides-haproxy-dev
         volumes:

docker-compose.prod.yml

@@ -2,10 +2,20 @@ version: '3'
 services:
     datastore-writer:
         build:
-            context: "https://github.com/OpenSlides/openslides-datastore-service.git#:writer"
+            context: "https://github.com/OpenSlides/openslides-datastore-service.git"
             args:
                 GIT_CHECKOUT: "${OPENSLIDES_DATASTORE_SERVICE_COMMIT_HASH}"
+                MODULE: "writer"
+                PORT: "${OPENSLIDES_DATASTORE_WRITER_PORT}"
         image: openslides-datastore-writer
+    datastore-reader:
+        build:
+            context: "https://github.com/OpenSlides/openslides-datastore-service.git"
+            args:
+                GIT_CHECKOUT: "${OPENSLIDES_DATASTORE_SERVICE_COMMIT_HASH}"
+                MODULE: "reader"
+                PORT: "${OPENSLIDES_DATASTORE_READER_PORT}"
+        image: openslides-datastore-reader
     client:
         build:
             context: "https://github.com/OpenSlides/openslides-client.git"

docker-compose.yml

@@ -1,15 +1,16 @@
 version: '3'
 services:
     # DATASTORE SECTION
+    datastore-reader:
+        depends_on:
+            - datastore-postgresql
+        env_file: services.env
+        networks:
+            - datastore-postgresql
     datastore-writer:
         depends_on:
             - datastore-postgresql
             - message-bus
-        environment:
-            - DATASTORE_DATABASE_HOST=datastore-postgresql
-            - DATASTORE_DATABASE_USER=openslides
-            - DATASTORE_DATABASE_PASSWORD=openslides
-            - DATASTORE_DATABASE_NAME=openslides
         env_file: services.env
         networks:
             - datastore-postgresql

services.env

@@ -1,4 +1,6 @@
 MESSAGE_BUS_HOST=message-bus
 MESSAGE_BUS_PORT=6379
 DATASTORE_WRITER_HOST=datastore-writer
-DATASTORE_WRITER_PORT=8000
+DATASTORE_WRITER_PORT=8000
+DATASTORE_WRITER_HOST=datastore-reader
+DATASTORE_WRITER_PORT=8001