Skip to content

Commit 1639315

Browse files
chaptersixchaptersix
authored
Revert "remove autosetup (#707)" (#710)
This reverts commit c1fa10c.
1 parent c1fa10c commit 1639315

7 files changed

Lines changed: 22 additions & 87 deletions

File tree

‎.github/workflows/dotnet.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ jobs:
4545
name: ${{ inputs.docker-image-artifact-name }}
4646
path: /tmp/server-docker
4747

48-
- name: Load server Docker Images
48+
- name: Load server Docker image
4949
if: ${{ inputs.docker-image-artifact-name }}
50-
run: |
51-
docker load --input /tmp/server-docker/temporal-server.tar
52-
docker load --input /tmp/server-docker/temporal-admin-tools.tar
50+
run: docker load --input /tmp/server-docker/temporal-autosetup.tar
5351
working-directory: '.'
5452

5553
- name: Override IMAGE_TAG environment variable
@@ -112,7 +110,7 @@ jobs:
112110
docker compose \
113111
-f ./dockerfiles/docker-compose.for-server-image.yaml \
114112
-f /tmp/server-docker/docker-compose.yml \
115-
up -d cassandra elasticsearch temporal-admin-tools temporal-server
113+
up -d temporal-server cassandra elasticsearch
116114
117115
- name: Run SDK-features tests directly
118116
if: inputs.docker-image-artifact-name == ''

‎.github/workflows/go.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ jobs:
4545
name: ${{ inputs.docker-image-artifact-name }}
4646
path: /tmp/server-docker
4747

48-
- name: Load server Docker Images
48+
- name: Load server Docker image
4949
if: ${{ inputs.docker-image-artifact-name }}
50-
run: |
51-
docker load --input /tmp/server-docker/temporal-server.tar
52-
docker load --input /tmp/server-docker/temporal-admin-tools.tar
50+
run: docker load --input /tmp/server-docker/temporal-autosetup.tar
5351
working-directory: '.'
5452

5553
- name: Override IMAGE_TAG environment variable
@@ -89,7 +87,7 @@ jobs:
8987
docker compose \
9088
-f ./dockerfiles/docker-compose.for-server-image.yaml \
9189
-f /tmp/server-docker/docker-compose.yml \
92-
up -d cassandra elasticsearch temporal-admin-tools temporal-server
90+
up -d temporal-server cassandra elasticsearch
9391
9492
- name: Run SDK-features tests directly
9593
if: inputs.docker-image-artifact-name == ''

‎.github/workflows/java.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@ jobs:
4646
name: ${{ inputs.docker-image-artifact-name }}
4747
path: /tmp/server-docker
4848

49-
- name: Load server Docker Images
49+
- name: Load server Docker image
5050
if: ${{ inputs.docker-image-artifact-name }}
51-
run: |
52-
docker load --input /tmp/server-docker/temporal-server.tar
53-
docker load --input /tmp/server-docker/temporal-admin-tools.tar
51+
run: docker load --input /tmp/server-docker/temporal-autosetup.tar
5452
working-directory: '.'
5553

5654
- name: Override IMAGE_TAG environment variable
@@ -95,7 +93,7 @@ jobs:
9593
docker compose \
9694
-f ./dockerfiles/docker-compose.for-server-image.yaml \
9795
-f /tmp/server-docker/docker-compose.yml \
98-
up -d cassandra elasticsearch temporal-admin-tools temporal-server
96+
up -d temporal-server cassandra elasticsearch
9997
10098
- name: Run SDK-features tests directly
10199
if: inputs.docker-image-artifact-name == ''

‎.github/workflows/php.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@ jobs:
4747
name: ${{ inputs.docker-image-artifact-name }}
4848
path: /tmp/server-docker
4949

50-
- name: Load server Docker Images
50+
- name: Load server Docker image
5151
if: ${{ inputs.docker-image-artifact-name }}
52-
run: |
53-
docker load --input /tmp/server-docker/temporal-server.tar
54-
docker load --input /tmp/server-docker/temporal-admin-tools.tar
52+
run: docker load --input /tmp/server-docker/temporal-autosetup.tar
5553
working-directory: '.'
5654

5755
- name: Override IMAGE_TAG environment variable
@@ -87,7 +85,7 @@ jobs:
8785
docker compose \
8886
-f ./dockerfiles/docker-compose.for-server-image.yaml \
8987
-f /tmp/server-docker/docker-compose.yml \
90-
up -d cassandra elasticsearch temporal-admin-tools temporal-server
88+
up -d temporal-server cassandra elasticsearch
9189
9290
- name: Run SDK-features tests directly
9391
if: inputs.docker-image-artifact-name == ''

‎.github/workflows/python.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ jobs:
4545
name: ${{ inputs.docker-image-artifact-name }}
4646
path: /tmp/server-docker
4747

48-
- name: Load server Docker Images
48+
- name: Load server Docker image
4949
if: ${{ inputs.docker-image-artifact-name }}
50-
run: |
51-
docker load --input /tmp/server-docker/temporal-server.tar
52-
docker load --input /tmp/server-docker/temporal-admin-tools.tar
50+
run: docker load --input /tmp/server-docker/temporal-autosetup.tar
5351
working-directory: '.'
5452

5553
- name: Override IMAGE_TAG environment variable
@@ -114,7 +112,7 @@ jobs:
114112
docker compose \
115113
-f ./dockerfiles/docker-compose.for-server-image.yaml \
116114
-f /tmp/server-docker/docker-compose.yml \
117-
up -d cassandra elasticsearch temporal-admin-tools temporal-server
115+
up -d temporal-server cassandra elasticsearch
118116
119117
- name: Run SDK-features tests directly
120118
if: inputs.docker-image-artifact-name == ''

‎.github/workflows/typescript.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ jobs:
4545
name: ${{ inputs.docker-image-artifact-name }}
4646
path: /tmp/server-docker
4747

48-
- name: Load server Docker Images
48+
- name: Load server Docker image
4949
if: ${{ inputs.docker-image-artifact-name }}
50-
run: |
51-
docker load --input /tmp/server-docker/temporal-server.tar
52-
docker load --input /tmp/server-docker/temporal-admin-tools.tar
50+
run: docker load --input /tmp/server-docker/temporal-autosetup.tar
5351
working-directory: '.'
5452

5553
- name: Override IMAGE_TAG environment variable
@@ -124,7 +122,7 @@ jobs:
124122
docker compose \
125123
-f ./dockerfiles/docker-compose.for-server-image.yaml \
126124
-f /tmp/server-docker/docker-compose.yml \
127-
up -d cassandra elasticsearch temporal-admin-tools temporal-server
125+
up -d temporal-server cassandra elasticsearch
128126
129127
- name: Run SDK-features tests directly
130128
if: inputs.docker-image-artifact-name == ''

‎dockerfiles/docker-compose.for-server-image.yaml‎

Lines changed: 4 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,8 @@
33
version: '3.5'
44

55
services:
6-
# Extend cassandra service with healthcheck and network
7-
cassandra:
8-
networks:
9-
- temporal-dev-network
10-
healthcheck:
11-
test: ["CMD", "cqlsh", "-e", "describe keyspaces"]
12-
interval: 5s
13-
timeout: 5s
14-
retries: 60
15-
start_period: 30s
16-
17-
# Extend elasticsearch service with healthcheck and network
18-
elasticsearch:
19-
networks:
20-
- temporal-dev-network
21-
healthcheck:
22-
test: ["CMD-SHELL", "curl -f http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=1s || exit 1"]
23-
interval: 5s
24-
timeout: 5s
25-
retries: 60
26-
start_period: 30s
27-
28-
temporal-admin-tools:
29-
image: temporaliotest/admin-tools:${IMAGE_TAG:-latest}
30-
container_name: temporal-admin-tools
31-
depends_on:
32-
cassandra:
33-
condition: service_healthy
34-
elasticsearch:
35-
condition: service_healthy
36-
environment:
37-
- CASSANDRA_SEEDS=cassandra
38-
- ES_HOST=elasticsearch
39-
- ES_PORT=9200
40-
- ES_SCHEME=http
41-
- ES_VERSION=v7
42-
- ES_VISIBILITY_INDEX=temporal_visibility_v1_dev
43-
networks:
44-
- temporal-dev-network
45-
entrypoint: ["/bin/sh", "-c"]
46-
command: >
47-
"echo 'Starting admin-tools setup...' &&
48-
temporal-cassandra-tool --ep cassandra create -k temporal --rf 1 &&
49-
temporal-cassandra-tool --ep cassandra -k temporal setup-schema -v 0.0 &&
50-
temporal-cassandra-tool --ep cassandra -k temporal update-schema -d /etc/temporal/schema/cassandra/temporal/versioned &&
51-
curl -X PUT --fail \"$$ES_SCHEME://$$ES_HOST:$$ES_PORT/_template/temporal_visibility_v1_template\" -H 'Content-Type: application/json' --data-binary \"@/etc/temporal/schema/elasticsearch/visibility/index_template_$$ES_VERSION.json\" &&
52-
curl --head --fail \"$$ES_SCHEME://$$ES_HOST:$$ES_PORT/$$ES_VISIBILITY_INDEX\" || curl -X PUT --fail \"$$ES_SCHEME://$$ES_HOST:$$ES_PORT/$$ES_VISIBILITY_INDEX\" &&
53-
echo 'Cassandra and Elasticsearch setup complete'"
54-
556
temporal-server:
56-
image: temporaliotest/server:${IMAGE_TAG:-latest}
57-
depends_on:
58-
temporal-admin-tools:
59-
condition: service_completed_successfully
7+
image: temporaliotest/auto-setup:${IMAGE_TAG:-latest}
608
environment:
619
- CASSANDRA_SEEDS=cassandra
6210
- ENABLE_ES=true
@@ -66,6 +14,9 @@ services:
6614
- ./dynamicconfig:/etc/temporal/config/dynamicconfig
6715
ports:
6816
- '7233:7233'
17+
depends_on:
18+
- cassandra
19+
- elasticsearch
6920
networks:
7021
- temporal-dev-network
7122

@@ -128,7 +79,3 @@ services:
12879
- temporal-server
12980
networks:
13081
- temporal-dev-network
131-
132-
networks:
133-
temporal-dev-network:
134-
driver: bridge

0 commit comments

Comments
 (0)