Merge pull request #5489 from FinnStutzenstein/includeMediaService

WIP: Adding media service

.gitmodules

@@ -17,3 +17,7 @@
 	path = openslides-auth-service
 	url = git@github.com:OpenSlides/openslides-auth-service.git
 	branch = master
+[submodule "openslides-media-service"]
+	path = openslides-media-service
+	url = git@github.com:OpenSlides/openslides-media-service.git
+	branch = openslides4-dev

docker-compose.dev.yml

@@ -32,6 +32,10 @@ services:
     image: openslides-auth-dev
     volumes:
       - ./openslides-auth-service/auth/src:/app/src
+  media:
+    image: openslides-media-dev
+    volumes:
+      - ./openslides-media-service/src:/app/src
   haproxy:
     image: openslides-haproxy-dev
     volumes:

docker-compose.prod.yml

@@ -11,7 +11,7 @@ services:
     networks:
       - backend
       - datastore-reader
-      - datastore-postgresql
+      - postgres
 
   datastore-writer:
     build:
@@ -23,12 +23,12 @@ services:
     image: openslides-datastore-writer
     networks:
       - backend
-      - datastore-postgresql
+      - postgres
       - message-bus
 
-  datastore-postgresql:
+  postgres:
     networks:
-      - datastore-postgresql
+      - postgres
 
   client:
     build:
@@ -67,6 +67,14 @@ services:
     networks:
       - message-bus
 
+  media:
+    # TODO: build
+    image: openslides-media
+    networks:
+      - frontend
+      - backend
+      - postgres
+
   haproxy:
     build: ./haproxy
     image: openslides-haproxy
@@ -75,14 +83,14 @@ services:
       - frontend
 
 # Setup: host <-uplink-> haproxy <-frontend-> services that are reachable from the client <-backend-> services that are internal-only
-# There are special networks for some services only, e.g. datastore-postgresql only for the postgresql, datastore reader and datastore writer
+# There are special networks for some services only, e.g. postgres only for the postgresql, datastore reader and datastore writer
 networks:
   uplink:
   frontend:
     internal: true
   backend:
     internal: true
-  datastore-postgresql:
+  postgres:
     internal: true
   datastore-reader:
     internal: true

docker-compose.yml

@@ -3,21 +3,15 @@ services:
   # DATASTORE SECTION
   datastore-reader:
     depends_on:
-      - datastore-postgresql
+      - postgres
     env_file: services.env
     environment:
       - NUM_WORKERS=8
   datastore-writer:
     depends_on:
-      - datastore-postgresql
+      - postgres
       - message-bus
     env_file: services.env
-  datastore-postgresql:
-    image: postgres:11
-    environment:
-      - POSTGRES_USER=openslides
-      - POSTGRES_PASSWORD=openslides
-      - POSTGRES_DB=openslides
 
   # CLIENT
   client:
@@ -48,6 +42,21 @@ services:
   cache:
     image: redis:latest
 
+  # MEDIA
+  media:
+    depends_on:
+      - backend
+      - postgres
+    env_file: services.env
+
+  # PERSISTENCE
+  postgres:
+    image: postgres:11
+    environment:
+      - POSTGRES_USER=openslides
+      - POSTGRES_PASSWORD=openslides
+      - POSTGRES_DB=openslides
+
   # SHARED
   message-bus:
     image: redis:latest

haproxy/src/haproxy.cfg

@@ -30,6 +30,9 @@ frontend https
     acl auth path_beg -i /system/auth
     use_backend backend_auth if auth
 
+    acl media path_beg -i /system/media
+    use_backend backend_media if media
+
     stats enable
     stats uri /stats
     stats refresh 10s
@@ -53,4 +56,8 @@ backend backend_autoupdate
 
 backend backend_auth
     mode http
-    server auth auth:9004 resolvers docker_resolver check
+    server auth auth:9004 resolvers docker_resolver check
+
+backend backend_media
+    mode http
+    server media media:9006 resolvers docker_resolver check

openslides-media-service

@@ -0,0 +1 @@
+Subproject commit 400d8699e6569e26e2e64dfd3215bbc02c3622f0

services.env

@@ -5,8 +5,7 @@ DATASTORE_READER_HOST=datastore-reader
 DATASTORE_READER_PORT=9010
 DATASTORE_WRITER_HOST=datastore-writer
 DATASTORE_WRITER_PORT=9011
-
+DATASTORE_DATABASE_HOST=postgres
-DATASTORE_DATABASE_HOST=datastore-postgresql
 
 ACTION_HOST=backend
 ACTION_PORT=9002
@@ -16,4 +15,9 @@ PRESENTER_PORT=9003
 AUTH_HOST=auth
 AUTH_PORT=9004
 CACHE_HOST=cache
-CACHE_PORT=6379
+CACHE_PORT=6379
+
+MEDIA_HOST=media
+MEDIA_PORT=9006
+MEDIA_DATABASE_HOST=postgres
+MEDIA_DATABASE_NAME=openslides