Skip to content

Commit 7ffa04c

Browse files
author
Mark Markaryan
authored
Remove statsd from / add admin-tools to docker-compose files (#536)
* Adding admin-tools to docker-compose files * Switch docker-compose files from auto-setup to server + AUTO_SETUP=true * Provide an easy way to specify image tags for server and admin-tools images * Provide an easy way to specify image tags for web images * Minor formatting clean up of docker-compose files * Remove statsd from docker-compose files
1 parent 3fb0ca8 commit 7ffa04c

File tree

5 files changed

+46
-29
lines changed

5 files changed

+46
-29
lines changed

‎docker/docker-compose-cockroach.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ services:
1212
cap_drop:
1313
- ALL
1414
command: ["start", "--insecure"]
15-
1615
temporal:
17-
image: temporalio/auto-setup:0.26.0
16+
image: temporalio/server:${SERVER_TAG:-0.26.0}
1817
ports:
1918
- "7233:7233"
2019
environment:
20+
- "AUTO_SETUP=true"
2121
- "DB=postgres"
2222
- "DB_PORT=26257"
2323
- "POSTGRES_USER=root"
@@ -28,9 +28,16 @@ services:
2828
- cockroach
2929
links:
3030
- cockroach:postgres
31-
31+
temporal-admin-tools:
32+
image: temporalio/admin-tools:${SERVER_TAG:-0.26.0}
33+
stdin_open: true
34+
tty: true
35+
environment:
36+
- "TEMPORAL_CLI_ADDRESS=temporal:7233"
37+
depends_on:
38+
- temporal
3239
temporal-web:
33-
image: temporalio/web:0.26.0
40+
image: temporalio/web:${WEB_TAG:-0.26.0}
3441
environment:
3542
- "TEMPORAL_GRPC_ENDPOINT=temporal:7233"
3643
ports:

‎docker/docker-compose-es.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ services:
4141
- kafka
4242
- elasticsearch
4343
temporal-admin-tools:
44-
image: temporalio/admin-tools:${ADMIN_TOOLS_TAG:-0.26.0}
44+
image: temporalio/admin-tools:${SERVER_TAG:-0.26.0}
4545
stdin_open: true
4646
tty: true
4747
environment:
4848
- "TEMPORAL_CLI_ADDRESS=temporal:7233"
4949
depends_on:
5050
- temporal
5151
temporal-web:
52-
image: temporalio/web:0.26.0
52+
image: temporalio/web:${WEB_TAG:-0.26.0}
5353
environment:
5454
- "TEMPORAL_GRPC_ENDPOINT=temporal:7233"
5555
ports:

‎docker/docker-compose-mysql.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@ services:
66
- "3306:3306"
77
environment:
88
- "MYSQL_ROOT_PASSWORD=root"
9-
statsd:
10-
image: graphiteapp/graphite-statsd
11-
ports:
12-
- "8080:80"
13-
- "2003:2003"
14-
- "8125:8125"
15-
- "8126:8126"
169
temporal:
17-
image: temporalio/auto-setup:0.26.0
10+
image: temporalio/server:${SERVER_TAG:-0.26.0}
1811
ports:
1912
- "7233:7233"
2013
environment:
14+
- "AUTO_SETUP=true"
2115
- "DB=mysql"
2216
- "MYSQL_USER=root"
2317
- "MYSQL_PWD=root"
2418
- "MYSQL_SEEDS=mysql"
25-
- "STATSD_ENDPOINT=statsd:8125"
2619
- "DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development.yaml"
2720
depends_on:
2821
- mysql
29-
- statsd
22+
temporal-admin-tools:
23+
image: temporalio/admin-tools:${SERVER_TAG:-0.26.0}
24+
stdin_open: true
25+
tty: true
26+
environment:
27+
- "TEMPORAL_CLI_ADDRESS=temporal:7233"
28+
depends_on:
29+
- temporal
3030
temporal-web:
31-
image: temporalio/web:0.26.0
31+
image: temporalio/web:${WEB_TAG:-0.26.0}
3232
environment:
3333
- "TEMPORAL_GRPC_ENDPOINT=temporal:7233"
3434
ports:

‎docker/docker-compose-postgres.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,30 @@ services:
77
POSTGRES_PASSWORD: temporal
88
ports:
99
- "5432:5432"
10-
statsd:
11-
image: graphiteapp/graphite-statsd
12-
ports:
13-
- "8080:80"
14-
- "2003:2003"
15-
- "8125:8125"
16-
- "8126:8126"
1710
temporal:
18-
image: temporalio/auto-setup:0.26.0
11+
image: temporalio/server:${SERVER_TAG:-0.26.0}
1912
ports:
2013
- "7233:7233"
2114
environment:
15+
- "AUTO_SETUP=true"
2216
- "DB=postgres"
2317
- "DB_PORT=5432"
2418
- "POSTGRES_USER=temporal"
2519
- "POSTGRES_PWD=temporal"
2620
- "POSTGRES_SEEDS=postgres"
27-
- "STATSD_ENDPOINT=statsd:8125"
2821
- "DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development.yaml"
2922
depends_on:
3023
- postgres
24+
temporal-admin-tools:
25+
image: temporalio/admin-tools:${SERVER_TAG:-0.26.0}
26+
stdin_open: true
27+
tty: true
28+
environment:
29+
- "TEMPORAL_CLI_ADDRESS=temporal:7233"
30+
depends_on:
31+
- temporal
3132
temporal-web:
32-
image: temporalio/web:0.26.0
33+
image: temporalio/web:${WEB_TAG:-0.26.0}
3334
environment:
3435
- "TEMPORAL_GRPC_ENDPOINT=temporal:7233"
3536
ports:

‎docker/docker-compose.yml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,25 @@ services:
66
ports:
77
- "9042:9042"
88
temporal:
9-
image: temporalio/auto-setup:0.26.0
9+
image: temporalio/server:${SERVER_TAG:-0.26.0}
1010
ports:
1111
- "7233:7233"
1212
environment:
13+
- "AUTO_SETUP=true"
1314
- "CASSANDRA_SEEDS=cassandra"
1415
- "DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development.yaml"
1516
depends_on:
1617
- cassandra
18+
temporal-admin-tools:
19+
image: temporalio/admin-tools:${SERVER_TAG:-0.26.0}
20+
stdin_open: true
21+
tty: true
22+
environment:
23+
- "TEMPORAL_CLI_ADDRESS=temporal:7233"
24+
depends_on:
25+
- temporal
1726
temporal-web:
18-
image: temporalio/web:0.26.0
27+
image: temporalio/web:${WEB_TAG:-0.26.0}
1928
environment:
2029
- "TEMPORAL_GRPC_ENDPOINT=temporal:7233"
2130
ports:

0 commit comments

Comments
 (0)