Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more options to config_template for docker image #4084

Merged
merged 14 commits into from
Apr 6, 2021
Merged

Add more options to config_template for docker image #4084

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5600b35
Add more options to config_template for docker image
peaaceChoi Mar 29, 2021
3663b19
Fix some option name
peaaceChoi Mar 30, 2021
ec09fc0
Fix key of bind-ip
peaaceChoi Mar 30, 2021
e1f7d13
Merge branch 'master' into docker-config-template-more-opts
peaaceChoi Mar 30, 2021
24edffd
rerun
longquanzheng Mar 30, 2021
177ab84
rerun
longquanzheng Mar 30, 2021
036e222
Merge branch 'master' into docker-config-template-more-opts
peaaceChoi Mar 31, 2021
875c873
Merge branch 'master' into docker-config-template-more-opts
peaaceChoi Mar 31, 2021
8f8caf1
Merge branch 'master' into docker-config-template-more-opts
meiliang86 Mar 31, 2021
74cf50e
Merge branch 'master' into docker-config-template-more-opts
peaaceChoi Apr 1, 2021
8eab43f
Merge branch 'master' into docker-config-template-more-opts
longquanzheng Apr 3, 2021
d9ae0fb
Merge branch 'master' into docker-config-template-more-opts
meiliang86 Apr 5, 2021
66058ec
Merge branch 'master' into docker-config-template-more-opts
peaaceChoi Apr 6, 2021
ae98ef5
Merge branch 'master' into docker-config-template-more-opts
longquanzheng Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions docker/config_template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ persistence:
password: {{ default .Env.ES_PWD "" }}
url:
scheme: "http"
host: "{{ default .Env.ES_SEEDS "" }}:9200"
host: "{{ default .Env.ES_SEEDS "" }}:{{ default .Env.ES_PORT "9200" }}"
indices:
visibility: cadence-visibility-dev
visibility: {{ default .Env.VISIBILITY_NAME "cadence-visibility-dev" }}
{{- end }}

ringpop:
Expand All @@ -101,17 +101,17 @@ ringpop:
{{- end }}
{{- else }}
bootstrapHosts:
- {{ .Env.HOST_IP }}:7933
- {{ .Env.HOST_IP }}:7934
- {{ .Env.HOST_IP }}:7935
- {{ .Env.HOST_IP }}:7939
- {{ .Env.HOST_IP }}:{{ default .Env.FRONTEND_PORT "7933" }}
- {{ .Env.HOST_IP }}:{{ default .Env.HISTORY_PORT "7934" }}
- {{ .Env.HOST_IP }}:{{ default .Env.MATCHING_PORT "7935" }}
- {{ .Env.HOST_IP }}:{{ default .Env.WORKER_PORT "7939" }}
{{- end }}
maxJoinDuration: 30s

services:
frontend:
rpc:
port: 7933
port: {{ default .Env.FRONTEND_PORT "7933" }}
bindOnIP: {{ default .Env.BIND_ON_IP "127.0.0.1" }}
{{- if .Env.STATSD_ENDPOINT }}
metrics:
Expand All @@ -132,7 +132,7 @@ services:

matching:
rpc:
port: 7935
port: {{ default .Env.MATCHING_PORT "7935" }}
bindOnIP: {{ default .Env.BIND_ON_IP "127.0.0.1" }}
{{- if .Env.STATSD_ENDPOINT }}
metrics:
Expand All @@ -153,7 +153,7 @@ services:

history:
rpc:
port: 7934
port: {{ default .Env.HISTORY_PORT "7934" }}
bindOnIP: {{ default .Env.BIND_ON_IP "127.0.0.1" }}
{{- if .Env.STATSD_ENDPOINT }}
metrics:
Expand All @@ -174,7 +174,7 @@ services:

worker:
rpc:
port: 7939
port: {{ default .Env.WORKER_PORT "7939" }}
bindOnIP: {{ default .Env.BIND_ON_IP "127.0.0.1" }}
{{- if .Env.STATSD_ENDPOINT }}
metrics:
Expand Down Expand Up @@ -207,13 +207,13 @@ clusterMetadata:
enabled: true
initialFailoverVersion: 0
rpcName: "cadence-frontend"
rpcAddress: {{ default .Env.PRIMARY_SEEDS "cadence" }}:7933
rpcAddress: {{ default .Env.PRIMARY_FRONTEND_SERVICE "cadence" }}:{{ default .Env.FRONTEND_PORT "7933" }}
{{- if .Env.ENABLE_GLOBAL_DOMAIN }}
secondary:
enabled: true
initialFailoverVersion: 2
rpcName: "cadence-frontend"
rpcAddress: {{ default .Env.SECONDARY_SEEDS "cadence-secondary" }}:7933
rpcAddress: {{ default .Env.SECONDARY_FRONTEND_SERVICE "cadence-secondary" }}:{{ default .Env.FRONTEND_PORT "7933" }}
{{- end }}


Expand Down Expand Up @@ -252,19 +252,19 @@ kafka:
clusters:
test:
brokers:
- {{ default .Env.KAFKA_SEEDS "" }}:9092
- {{ default .Env.KAFKA_SEEDS "" }}:{{ default .Env.KAFKA_PORT "9092" }}
topics:
cadence-visibility-dev:
{{ default .Env.VISIBILITY_NAME "cadence-visibility-dev" }}:
cluster: test
cadence-visibility-dev-dlq:
{{ default .Env.VISIBILITY_NAME "cadence-visibility-dev" }}-dlq:
cluster: test
applications:
visibility:
topic: cadence-visibility-dev
dlq-topic: cadence-visibility-dev-dlq
topic: {{ default .Env.VISIBILITY_NAME "cadence-visibility-dev" }}
dlq-topic: {{ default .Env.VISIBILITY_NAME "cadence-visibility-dev" }}-dlq

publicClient:
hostPort: {{ default .Env.BIND_ON_IP "127.0.0.1" }}:7933
hostPort: {{ default .Env.FRONTEND_SERVICE "127.0.0.1" }}:{{ default .Env.FRONTEND_PORT "7933" }}

dynamicConfigClient:
filepath: {{ default .Env.DYNAMIC_CONFIG_FILE_PATH "/etc/cadence/config/dynamicconfig/development.yaml" }}
Expand Down