Merge pull request #5466 from GabrielInTheWorld/add-auth-service

Adds submodule openslides-auth-service

.gitmodules

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

docker-compose.dev.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 services:
   datastore-reader:
     image: openslides-datastore-reader-dev
@@ -28,6 +28,10 @@ services:
     volumes:
       - ./openslides-autoupdate-service/cmd:/root/cmd
       - ./openslides-autoupdate-service/internal:/root/internal
+  auth:
+    image: openslides-auth-dev
+    volumes:
+      - ./openslides-auth-service/auth:/app/auth
   haproxy:
     image: openslides-haproxy-dev
     volumes:

docker-compose.prod.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 services:
   datastore-reader:
     build:
@@ -10,6 +10,7 @@ services:
     image: openslides-datastore-reader
     networks:
       - backend
+      - datastore-reader
       - datastore-postgresql
 
   datastore-writer:
@@ -49,6 +50,19 @@ services:
       - backend
       - message-bus
 
+  auth:
+    build:
+      context: "https://github.com/OpenSlides/openslides-auth-service.git"
+      args:
+        GIT_CHECKOUT: "${OPENSLDIES_AUTH_SERVICE_COMMIT_HASH}"
+        PORT: "${OPENSLDIES_AUTH_SERVICE_PORT}"
+    image: openslides-auth
+    networks:
+      - datastore-reader
+      - auth
+  cache:
+    networks:
+      - auth
   message-bus:
     networks:
       - message-bus
@@ -70,5 +84,9 @@ networks:
     internal: true
   datastore-postgresql:
     internal: true
+  datastore-reader:
+    internal: true
   message-bus:
     internal: true
+  auth:
+    internal: true

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 services:
   # DATASTORE SECTION
   datastore-reader:
@@ -41,6 +41,15 @@ services:
       - message-bus
     env_file: services.env
 
+  # AUTH
+  auth:
+    depends_on:
+      - datastore-reader
+      - cache
+    env_file: services.env
+  cache:
+    image: redis:alpine
+
   # SHARED
   message-bus:
     image: redis:alpine

haproxy/src/haproxy.cfg

@@ -16,6 +16,9 @@ frontend http
     acl autoupdate path_beg -i /system/autoupdate
     use_backend backend_autoupdate if autoupdate
 
+    acl auth path_beg -i /system/auth
+    use_backend backend_auth if auth
+
     stats enable
     stats uri /stats
     stats refresh 10s
@@ -41,3 +44,9 @@ backend backend_autoupdate
     server autoupdate autoupdate:9012 resolvers docker_resolver check
     timeout connect 60s
     timeout server 60s
+
+backend backend_auth
+    mode http
+    server auth auth:9004 resolvers docker_resolver check
+    timeout connect 60s
+    timeout server 60s

openslides-auth-service

@@ -0,0 +1 @@
+Subproject commit 7258d3f3b581d4dc57c2a25c656e5caa73dd03fc

services.env

@@ -12,3 +12,8 @@ ACTION_HOST=backend
 ACTION_PORT=9002
 PRESENTER_HOST=backend
 PRESENTER_PORT=9003
+
+AUTH_HOST=auth
+AUTH_PORT=9004
+CACHE_HOST=cache
+CACHE_PORT=6379