commit
737eeeca2f
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -24,3 +24,6 @@
|
|||||||
[submodule "openslides-permission-service"]
|
[submodule "openslides-permission-service"]
|
||||||
path = openslides-permission-service
|
path = openslides-permission-service
|
||||||
url = git@github.com:OpenSlides/openslides-permission-service.git
|
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
|
||||||
|
@ -93,6 +93,14 @@ services:
|
|||||||
env_file: services.env
|
env_file: services.env
|
||||||
volumes:
|
volumes:
|
||||||
- ../openslides-media-service/src:/app/src
|
- ../openslides-media-service/src:/app/src
|
||||||
|
manage:
|
||||||
|
image: openslides-manage-dev
|
||||||
|
depends_on:
|
||||||
|
- auth
|
||||||
|
- datastore-writer
|
||||||
|
env_file: services.env
|
||||||
|
ports:
|
||||||
|
- "8001:8001"
|
||||||
message-bus:
|
message-bus:
|
||||||
image: redis:latest
|
image: redis:latest
|
||||||
haproxy:
|
haproxy:
|
||||||
|
@ -43,6 +43,10 @@ define(`MEDIA_IMAGE',
|
|||||||
ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
|
ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
|
||||||
ifenvelse(`DOCKER_OPENSLIDES_MEDIA_NAME', openslides-media):dnl
|
ifenvelse(`DOCKER_OPENSLIDES_MEDIA_NAME', openslides-media):dnl
|
||||||
ifenvelse(`DOCKER_OPENSLIDES_MEDIA_TAG', latest))
|
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(`PROJECT_DIR', ifdef(`PROJECT_DIR',PROJECT_DIR,.))
|
||||||
define(`ADMIN_SECRET_AVAILABLE', `syscmd(`test -f 'PROJECT_DIR`/secrets/admin.env')sysval')
|
define(`ADMIN_SECRET_AVAILABLE', `syscmd(`test -f 'PROJECT_DIR`/secrets/admin.env')sysval')
|
||||||
@ -169,6 +173,16 @@ services:
|
|||||||
- backend
|
- backend
|
||||||
- postgres
|
- postgres
|
||||||
|
|
||||||
|
manage:
|
||||||
|
image: MANAGE_IMAGE
|
||||||
|
depends_on:
|
||||||
|
- auth
|
||||||
|
- datastore-writer
|
||||||
|
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
|
# 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
|
# There are special networks for some services only, e.g. postgres only for the postgresql, datastore reader and datastore writer
|
||||||
networks:
|
networks:
|
||||||
|
1
openslides-manage-service
Submodule
1
openslides-manage-service
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 4cdf78ae0478e09b6db2740703856285bd0d82f3
|
Loading…
Reference in New Issue
Block a user