Merge pull request #6131 from ostcar/icc-service

Add ICC Service

.gitmodules

@@ -29,3 +29,6 @@
 	path = openslides-manage-service
 	url = https://github.com/OpenSlides/openslides-manage-service.git
 	branch = main
+[submodule "openslides-icc-service"]
+	path = openslides-icc-service
+	url = https://github.com/OpenSlides/openslides-icc-service.git

docker/docker-compose.dev.yml

@@ -14,6 +14,7 @@ services:
       - ../openslides-datastore-service/reader/reader:/app/reader
     ports:
       - 9010:9010
+      
   datastore-writer:
     image: openslides-datastore-writer-dev
     depends_on:
@@ -31,12 +32,14 @@ services:
       - OPENSLIDES_DEVELOPMENT=1
     ports:
       - 9011:9011
+
   postgres:
     image: postgres:11
     environment:
       - POSTGRES_USER=openslides
       - POSTGRES_PASSWORD=openslides
       - POSTGRES_DB=openslides
+
   client:
     image: openslides-client-dev
     depends_on:
@@ -47,6 +50,7 @@ services:
       - OPENSLIDES_DEVELOPMENT=1
     volumes:
       - ../openslides-client/client/src:/app/src
+
   backend:
     image: openslides-backend-dev
     depends_on:
@@ -59,6 +63,7 @@ services:
       - OPENSLIDES_DEVELOPMENT=1
     volumes:
       - ../openslides-backend/openslides_backend:/app/openslides_backend
+
   autoupdate:
     image: openslides-autoupdate-dev
     depends_on:
@@ -70,6 +75,21 @@ services:
     volumes:
       - ../openslides-autoupdate-service/cmd:/root/cmd
       - ../openslides-autoupdate-service/internal:/root/internal
+      - ../openslides-autoupdate-service/pkg:/root/pkg
+
+  icc:
+    image: openslides-icc-dev
+    depends_on:
+      - datastore-reader
+      - message-bus
+      - auth
+    env_file: services.env
+    environment:
+      - OPENSLIDES_DEVELOPMENT=1
+    volumes:
+      - ../openslides-icc-service/cmd:/root/cmd
+      - ../openslides-icc-service/internal:/root/internal
+
   permission:
     image: openslides-permission-dev
     depends_on:
@@ -81,6 +101,7 @@ services:
       - ../openslides-permission-service/cmd:/app/cmd
       - ../openslides-permission-service/internal:/app/internal
       - ../openslides-permission-service/pkg:/app/pkg
+    
   auth:
     image: openslides-auth-dev
     depends_on:
@@ -91,8 +112,10 @@ services:
       - OPENSLIDES_DEVELOPMENT=1
     volumes:
       - ../openslides-auth-service/auth/src:/app/src
+
   cache:
     image: redis:latest
+
   media:
     image: openslides-media-dev
     depends_on:
@@ -103,6 +126,7 @@ services:
       - OPENSLIDES_DEVELOPMENT=1
     volumes:
       - ../openslides-media-service/src:/app/src
+
   manage:
     image: openslides-manage-dev
     depends_on:
@@ -113,8 +137,10 @@ services:
       - OPENSLIDES_DEVELOPMENT=1
     ports:
     - "9008:9008"
+
   message-bus:
     image: redis:latest
+
   proxy:
     image: openslides-proxy-dev
     depends_on:

docker/docker-compose.yml.m4

@@ -31,6 +31,10 @@ define(`AUTOUPDATE_IMAGE',
 ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
 ifenvelse(`DOCKER_OPENSLIDES_AUTOUPDATE_NAME', openslides-autoupdate):dnl
 ifenvelse(`DOCKER_OPENSLIDES_AUTOUPDATE_TAG', latest-4))
+define(`ICC_IMAGE',
+ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
+ifenvelse(`DOCKER_OPENSLIDES_ICC_NAME', openslides-icc):dnl
+ifenvelse(`DOCKER_OPENSLIDES_ICC_TAG', latest-4))
 define(`DATASTORE_READER_IMAGE',
 ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
 ifenvelse(`DOCKER_OPENSLIDES_DATASTORE_READER_NAME', openslides-datastore-reader):dnl
@@ -140,6 +144,7 @@ services:
     depends_on:
       - datastore-reader
       - message-bus
+      - auth
     env_file: services.env
     networks:
       - frontend
@@ -149,6 +154,21 @@ services:
       - auth_token_key
       - auth_cookie_key
 
+  icc:
+    image: ICC_IMAGE
+    depends_on:
+      - datastore-reader
+      - message-bus
+      - auth
+    enc_file: services.env
+    networks:
+      - frontend
+      - backend
+      - message-bus
+    secrets:
+      - auth_token_key
+      - auth_cookie_key
+
   auth:
     image: AUTH_IMAGE
     depends_on:

docker/docker-stack.yml.m4

@@ -31,6 +31,10 @@ define(`AUTOUPDATE_IMAGE',
 ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
 ifenvelse(`DOCKER_OPENSLIDES_AUTOUPDATE_NAME', openslides-autoupdate):dnl
 ifenvelse(`DOCKER_OPENSLIDES_AUTOUPDATE_TAG', latest-4))
+define(`ICC_IMAGE',
+ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
+ifenvelse(`DOCKER_OPENSLIDES_ICC_NAME', openslides-icc):dnl
+ifenvelse(`DOCKER_OPENSLIDES_ICC_TAG', latest-4))
 define(`DATASTORE_READER_IMAGE',
 ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
 ifenvelse(`DOCKER_OPENSLIDES_DATASTORE_READER_NAME', openslides-datastore-reader):dnl
@@ -162,6 +166,23 @@ services:
       - auth_token_key
       - auth_cookie_key
 
+  icc:
+    image: ICC_IMAGE
+    enc_file: services.env
+    networks:
+      - frontend
+      - backend
+      - message-bus
+    deploy:
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+      replicas: ifenvelse(`OPENSLIDES_ICC_REPLICAS', 1)
+    secrets:
+      - auth_token_key
+      - auth_cookie_key
+
+
   auth:
     image: AUTH_IMAGE
     env_file: services.env

docker/services.env

@@ -22,6 +22,8 @@ AUTH_HOST=auth
 AUTH_PORT=9004
 CACHE_HOST=cache
 CACHE_PORT=6379
+ICC_REDIS_HOST=message-bus
+ICC_REDIS_PORT=6379
 
 MEDIA_HOST=media
 MEDIA_PORT=9006

openslides-icc-service

@@ -0,0 +1 @@
+Subproject commit cd1e4b5abfae76670af9cb44b7533a7918fab382

proxy/Caddyfile

@@ -5,6 +5,9 @@ import endpoint
     reverse_proxy /system/autoupdate* autoupdate:9012 {
         flush_interval -1
     }
+    reverse_proxy /system/icc* icc:9013 {
+        flush_interval -1
+    }
     reverse_proxy /system/auth* auth:9004
     reverse_proxy /system/media* media:9006
 

proxy/Caddyfile.dev

@@ -6,6 +6,9 @@ https://:8000 {
     reverse_proxy /system/autoupdate* autoupdate:9012 {
         flush_interval -1
     }
+    reverse_proxy /system/icc* icc:9013 {
+        flush_interval -1
+    }
     reverse_proxy /system/auth* auth:9004
     reverse_proxy /system/media* media:9006