Skip to content

Commit e24c5ff

Browse files
authored
Add projector service (#256) (#257)
1 parent a356a04 commit e24c5ff

File tree

4 files changed

+48
-0
lines changed

4 files changed

+48
-0
lines changed

pkg/config/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ func NewYmlConfig(configFiles [][]byte) (*YmlConfig, error) {
240240
"auth",
241241
"vote",
242242
"search",
243+
"projector",
243244
"redis",
244245
"media",
245246
"icc",

pkg/config/default-config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ defaultEnvironment:
3636
AUTH_HOST: auth
3737
AUTH_PORT: 9004
3838

39+
PROJECTOR_HOST: projector
40+
PROJECTOR_PORT: 9051
41+
3942
SEARCH_HOST: search
4043
SEARCH_PORT: 9050
4144
RESTRICTER_URL: http://autoupdate:9012/internal/autoupdate

pkg/config/default-docker-compose.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ services:
1616
- backendPresenter
1717
- autoupdate
1818
- search
19+
- projector
1920
- auth
2021
- media
2122
- icc
@@ -56,6 +57,7 @@ services:
5657
- backendPresenter
5758
- autoupdate
5859
- search
60+
- projector
5961
- auth
6062
- media
6163
- icc
@@ -254,6 +256,28 @@ services:
254256
{{- with .AdditionalContent }}{{ marshalContent 4 . }}{{- end }}
255257
{{- end }}
256258

259+
{{- with .Services.projector }}
260+
261+
projector:
262+
image: {{ .ContainerRegistry }}/openslides-projector:{{ .Tag }}
263+
{{- if checkFlag $.DisableDependsOn }}{{ else }}
264+
depends_on:
265+
- autoupdate
266+
- backendAction
267+
- postgres
268+
{{- end }}
269+
environment:
270+
<< : *default-environment
271+
{{- with .Environment }}{{ marshalContent 6 . }}{{- end }}
272+
networks:
273+
- frontend
274+
- data
275+
secrets:
276+
- auth_token_key
277+
- auth_cookie_key
278+
- postgres_password
279+
{{- with .AdditionalContent }}{{ marshalContent 4 . }}{{- end }}
280+
{{- end }}
257281

258282
{{- with .Services.auth }}
259283

pkg/setup/setup_test.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,8 @@ x-default-environment: &default-environment
505505
OPENSLIDES_LOGLEVEL: info
506506
PRESENTER_HOST: backendPresenter
507507
PRESENTER_PORT: "9003"
508+
PROJECTOR_HOST: projector
509+
PROJECTOR_PORT: "9051"
508510
RESTRICTER_URL: http://autoupdate:9012/internal/autoupdate
509511
SEARCH_HOST: search
510512
SEARCH_PORT: "9050"
@@ -526,6 +528,7 @@ services:
526528
- backendPresenter
527529
- autoupdate
528530
- search
531+
- projector
529532
- auth
530533
- media
531534
- icc
@@ -551,6 +554,7 @@ services:
551554
- backendPresenter
552555
- autoupdate
553556
- search
557+
- projector
554558
- auth
555559
- media
556560
- icc
@@ -685,6 +689,22 @@ services:
685689
- auth_cookie_key
686690
- postgres_password
687691
692+
projector:
693+
image: ghcr.io/openslides/openslides/openslides-projector:latest
694+
depends_on:
695+
- autoupdate
696+
- backendAction
697+
- postgres
698+
environment:
699+
<< : *default-environment
700+
networks:
701+
- frontend
702+
- data
703+
secrets:
704+
- auth_token_key
705+
- auth_cookie_key
706+
- postgres_password
707+
688708
auth:
689709
image: ghcr.io/openslides/openslides/openslides-auth:latest
690710
depends_on:

0 commit comments

Comments
 (0)