From 1a965b903482d10cf4bc15aaa0ad72073d0d5f72 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 13 Mar 2021 10:31:25 +0100 Subject: [PATCH 1/2] Add manage service --- .gitmodules | 3 +++ docker/docker-compose.dev.yml | 6 ++++++ docker/docker-compose.yml.m4 | 14 ++++++++++++++ openslides-manage-service | 1 + 4 files changed, 24 insertions(+) create mode 160000 openslides-manage-service diff --git a/.gitmodules b/.gitmodules index 17b36605e..573864177 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,3 +24,6 @@ [submodule "openslides-permission-service"] path = openslides-permission-service url = git@github.com:OpenSlides/openslides-permission-service.git +[submodule "openslides-manage-service"] + path = openslides-manage-service + url = git@github.com:OpenSlides/openslides-manage-service.git diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 6e066df6e..0c7e2a217 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -93,6 +93,12 @@ services: env_file: services.env volumes: - ../openslides-media-service/src:/app/src + manage: + image: openslides-manage-dev + depends_on: + - auth + - datastore + env_file: services.env message-bus: image: redis:latest haproxy: diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4 index 6ac675364..b9ad9695a 100644 --- a/docker/docker-compose.yml.m4 +++ b/docker/docker-compose.yml.m4 @@ -43,6 +43,10 @@ define(`MEDIA_IMAGE', ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl ifenvelse(`DOCKER_OPENSLIDES_MEDIA_NAME', openslides-media):dnl ifenvelse(`DOCKER_OPENSLIDES_MEDIA_TAG', latest)) +define(`MANAGE_IMAGE', +ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl +ifenvelse(`DOCKER_OPENSLIDES_MANAGE_NAME', openslides-manage):dnl +ifenvelse(`DOCKER_OPENSLIDES_MANAGE_TAG', latest)) define(`PROJECT_DIR', ifdef(`PROJECT_DIR',PROJECT_DIR,.)) define(`ADMIN_SECRET_AVAILABLE', `syscmd(`test -f 'PROJECT_DIR`/secrets/admin.env')sysval') @@ -169,6 +173,16 @@ services: - backend - postgres + manage: + image: MANAGE_IMAGE + depends_on: + - auth + - datastore + env_file: services.env + networks: + - backend + - auth + # 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. postgres only for the postgresql, datastore reader and datastore writer networks: diff --git a/openslides-manage-service b/openslides-manage-service new file mode 160000 index 000000000..c4947e966 --- /dev/null +++ b/openslides-manage-service @@ -0,0 +1 @@ +Subproject commit c4947e9668b9e8caef49f88fe9e89658f80f5a1b From 5af507ea822bb6715d460b2d2071925ac4a6d5a7 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 13 Mar 2021 12:50:07 +0100 Subject: [PATCH 2/2] Fix docker-compose --- docker/docker-compose.dev.yml | 4 +++- docker/docker-compose.yml.m4 | 2 +- openslides-manage-service | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 0c7e2a217..a17760c47 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -97,8 +97,10 @@ services: image: openslides-manage-dev depends_on: - auth - - datastore + - datastore-writer env_file: services.env + ports: + - "8001:8001" message-bus: image: redis:latest haproxy: diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4 index b9ad9695a..025d2a591 100644 --- a/docker/docker-compose.yml.m4 +++ b/docker/docker-compose.yml.m4 @@ -177,7 +177,7 @@ services: image: MANAGE_IMAGE depends_on: - auth - - datastore + - datastore-writer env_file: services.env networks: - backend diff --git a/openslides-manage-service b/openslides-manage-service index c4947e966..4cdf78ae0 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit c4947e9668b9e8caef49f88fe9e89658f80f5a1b +Subproject commit 4cdf78ae0478e09b6db2740703856285bd0d82f3