Skip to content

Commit 3873413

Browse files
committed
feat(test-suite): wire compose manifests for project-scoped orchestration
1 parent 91db8af commit 3873413

19 files changed

+188
-80
lines changed

test-suite/fhevm/docker-compose/coprocessor-docker-compose.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ services:
1717
# =============================================================================
1818

1919
coprocessor-db-migration:
20-
container_name: coprocessor-db-migration
20+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-coprocessor-db-migration
2121
image: ghcr.io/zama-ai/fhevm/coprocessor/db-migration:${COPROCESSOR_DB_MIGRATION_VERSION}
2222
build:
2323
context: ../../..
2424
dockerfile: coprocessor/fhevm-engine/Dockerfile.workspace
2525
target: db-migration
2626
args:
2727
CARGO_PROFILE: ${FHEVM_CARGO_PROFILE:-release}
28+
BUILD_ID: ${FHEVM_BUILD_ID:-unknown}
2829
cache_from:
2930
- ${FHEVM_CACHE_FROM_COPROCESSOR:-type=gha}
3031
env_file:
@@ -38,14 +39,15 @@ services:
3839

3940
####################### COPROCESSOR SERVICES #######################
4041
coprocessor-host-listener:
41-
container_name: coprocessor-host-listener
42+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-coprocessor-host-listener
4243
image: ghcr.io/zama-ai/fhevm/coprocessor/host-listener:${COPROCESSOR_HOST_LISTENER_VERSION}
4344
build:
4445
context: ../../..
4546
dockerfile: coprocessor/fhevm-engine/Dockerfile.workspace
4647
target: host-listener
4748
args:
4849
CARGO_PROFILE: ${FHEVM_CARGO_PROFILE:-release}
50+
BUILD_ID: ${FHEVM_BUILD_ID:-unknown}
4951
cache_from:
5052
- ${FHEVM_CACHE_FROM_COPROCESSOR:-type=gha}
5153
env_file:
@@ -62,14 +64,15 @@ services:
6264
condition: service_completed_successfully
6365

6466
coprocessor-host-listener-poller:
65-
container_name: coprocessor-host-listener-poller
67+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-coprocessor-host-listener-poller
6668
image: ghcr.io/zama-ai/fhevm/coprocessor/host-listener:${COPROCESSOR_HOST_LISTENER_VERSION}
6769
build:
6870
context: ../../..
6971
dockerfile: coprocessor/fhevm-engine/Dockerfile.workspace
7072
target: host-listener
7173
args:
7274
CARGO_PROFILE: ${FHEVM_CARGO_PROFILE:-release}
75+
BUILD_ID: ${FHEVM_BUILD_ID:-unknown}
7376
cache_from:
7477
- ${FHEVM_CACHE_FROM_COPROCESSOR:-type=gha}
7578
env_file:
@@ -85,18 +88,19 @@ services:
8588
condition: service_completed_successfully
8689

8790
coprocessor-gw-listener:
88-
container_name: coprocessor-gw-listener
91+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-coprocessor-gw-listener
8992
image: ghcr.io/zama-ai/fhevm/coprocessor/gw-listener:${COPROCESSOR_GW_LISTENER_VERSION}
9093
build:
9194
context: ../../..
9295
dockerfile: coprocessor/fhevm-engine/Dockerfile.workspace
9396
target: gw-listener
9497
args:
9598
CARGO_PROFILE: ${FHEVM_CARGO_PROFILE:-release}
99+
BUILD_ID: ${FHEVM_BUILD_ID:-unknown}
96100
cache_from:
97101
- ${FHEVM_CACHE_FROM_COPROCESSOR:-type=gha}
98102
healthcheck:
99-
test: ["CMD-SHELL", "curl -f http://localhost:8080/liveness || exit 1"]
103+
test: ["CMD", "gw_listener", "--version"]
100104
interval: 10s
101105
timeout: 5s
102106
retries: 3
@@ -117,14 +121,15 @@ services:
117121
condition: service_completed_successfully
118122

119123
coprocessor-tfhe-worker:
120-
container_name: coprocessor-tfhe-worker
124+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-coprocessor-tfhe-worker
121125
image: ghcr.io/zama-ai/fhevm/coprocessor/tfhe-worker:${COPROCESSOR_TFHE_WORKER_VERSION}
122126
build:
123127
context: ../../..
124128
dockerfile: coprocessor/fhevm-engine/Dockerfile.workspace
125129
target: tfhe-worker
126130
args:
127131
CARGO_PROFILE: ${FHEVM_CARGO_PROFILE:-release}
132+
BUILD_ID: ${FHEVM_BUILD_ID:-unknown}
128133
cache_from:
129134
- ${FHEVM_CACHE_FROM_COPROCESSOR:-type=gha}
130135
cache_to:
@@ -146,14 +151,15 @@ services:
146151
condition: service_completed_successfully
147152

148153
coprocessor-zkproof-worker:
149-
container_name: coprocessor-zkproof-worker
154+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-coprocessor-zkproof-worker
150155
image: ghcr.io/zama-ai/fhevm/coprocessor/zkproof-worker:${COPROCESSOR_ZKPROOF_WORKER_VERSION}
151156
build:
152157
context: ../../..
153158
dockerfile: coprocessor/fhevm-engine/Dockerfile.workspace
154159
target: zkproof-worker
155160
args:
156161
CARGO_PROFILE: ${FHEVM_CARGO_PROFILE:-release}
162+
BUILD_ID: ${FHEVM_BUILD_ID:-unknown}
157163
cache_from:
158164
- ${FHEVM_CACHE_FROM_COPROCESSOR:-type=gha}
159165
env_file:
@@ -171,14 +177,15 @@ services:
171177
condition: service_completed_successfully
172178

173179
coprocessor-sns-worker:
174-
container_name: coprocessor-sns-worker
180+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-coprocessor-sns-worker
175181
image: ghcr.io/zama-ai/fhevm/coprocessor/sns-worker:${COPROCESSOR_SNS_WORKER_VERSION}
176182
build:
177183
context: ../../..
178184
dockerfile: coprocessor/fhevm-engine/Dockerfile.workspace
179185
target: sns-worker
180186
args:
181187
CARGO_PROFILE: ${FHEVM_CARGO_PROFILE:-release}
188+
BUILD_ID: ${FHEVM_BUILD_ID:-unknown}
182189
cache_from:
183190
- ${FHEVM_CACHE_FROM_COPROCESSOR:-type=gha}
184191
env_file:
@@ -208,14 +215,15 @@ services:
208215
condition: service_completed_successfully
209216

210217
coprocessor-transaction-sender:
211-
container_name: coprocessor-transaction-sender
218+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-coprocessor-transaction-sender
212219
image: ghcr.io/zama-ai/fhevm/coprocessor/tx-sender:${COPROCESSOR_TX_SENDER_VERSION}
213220
build:
214221
context: ../../..
215222
dockerfile: coprocessor/fhevm-engine/Dockerfile.workspace
216223
target: transaction-sender
217224
args:
218225
CARGO_PROFILE: ${FHEVM_CARGO_PROFILE:-release}
226+
BUILD_ID: ${FHEVM_BUILD_ID:-unknown}
219227
cache_from:
220228
- ${FHEVM_CACHE_FROM_COPROCESSOR:-type=gha}
221229
env_file:
Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22

33
kms-core:
4-
container_name: kms-core
4+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-kms-core
55
image: ghcr.io/zama-ai/kms/core-service:${CORE_VERSION}
66
env_file:
77
- ../env/staging/.env.core.local
@@ -17,17 +17,18 @@ services:
1717
echo '=================STARTING KMS SERVICE================='
1818
kms-server --config-file config/config.toml
1919
volumes:
20-
- fhevm_minio_secrets:/minio_secrets
20+
- minio_secrets:/minio_secrets
2121
- ../config/kms-core/config.toml:/app/kms/core/service/config/config.toml
2222
ports:
23-
- "50051:50051"
23+
- "${KMS_CORE_GRPC_PORT:-50051}:50051"
2424
healthcheck:
25-
test: "grpc_health_probe --addr=localhost:50051"
26-
interval: 1s
27-
timeout: 1s
28-
retries: 5
29-
start_period: 1s
25+
test: ["CMD-SHELL", "wget -q -O /dev/null http://localhost:9646/metrics"]
26+
interval: 10s
27+
timeout: 5s
28+
retries: 6
29+
start_period: 20s
3030

3131
volumes:
32-
fhevm_minio_secrets:
32+
minio_secrets:
33+
name: ${FHEVM_DOCKER_PROJECT:-fhevm}_minio_secrets
3334
external: true

test-suite/fhevm/docker-compose/database-docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
db:
3-
container_name: coprocessor-and-kms-db
3+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-coprocessor-and-kms-db
44
image: postgres:15.7
55
restart: always
66
command:
@@ -10,7 +10,7 @@ services:
1010
env_file:
1111
- ../env/staging/.env.database.local
1212
ports:
13-
- '5432:5432'
13+
- '${DB_EXPOSE_PORT:-5432}:5432'
1414
healthcheck:
1515
test: ["CMD-SHELL", "pg_isready -U postgres"]
1616
interval: 10s

test-suite/fhevm/docker-compose/gateway-mocked-payment-docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
gateway-deploy-mocked-zama-oft:
3-
container_name: gateway-deploy-mocked-zama-oft
3+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-gateway-deploy-mocked-zama-oft
44
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
55
build:
66
context: ../../../gateway-contracts
@@ -16,7 +16,7 @@ services:
1616

1717

1818
gateway-set-relayer-mocked-payment:
19-
container_name: gateway-set-relayer-mocked-payment
19+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-gateway-set-relayer-mocked-payment
2020
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
2121
build:
2222
context: ../../../gateway-contracts

test-suite/fhevm/docker-compose/gateway-node-docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
gateway-node:
3-
container_name: gateway-node
3+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-gateway-node
44
image: ghcr.io/foundry-rs/foundry:v1.3.5
55
env_file:
66
- ../env/staging/.env.gateway-node.local
@@ -19,4 +19,4 @@ services:
1919
- --mnemonic
2020
- "${MNEMONIC}"
2121
ports:
22-
- "8546:8546"
22+
- "${GATEWAY_NODE_RPC_PORT:-8546}:8546"

test-suite/fhevm/docker-compose/gateway-pause-docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
gateway-sc-pause:
3-
container_name: gateway-sc-pause
3+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-gateway-sc-pause
44
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
55
build:
66
context: ../../../gateway-contracts

test-suite/fhevm/docker-compose/gateway-sc-docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
gateway-sc-deploy:
3-
container_name: gateway-sc-deploy
3+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-gateway-sc-deploy
44
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
55
build:
66
context: ../../../gateway-contracts
@@ -17,7 +17,7 @@ services:
1717
- addresses-volume:/app/addresses # workdir in gateway's Dockerfile is /app
1818

1919
gateway-sc-add-network:
20-
container_name: gateway-sc-add-network
20+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-gateway-sc-add-network
2121
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
2222
build:
2323
context: ../../../gateway-contracts
@@ -39,7 +39,7 @@ services:
3939
- addresses-volume:/app/addresses # workdir in gateway's Dockerfile is /app
4040

4141
gateway-sc-add-pausers:
42-
container_name: gateway-sc-add-pausers
42+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-gateway-sc-add-pausers
4343
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
4444
build:
4545
context: ../../../gateway-contracts
@@ -61,7 +61,7 @@ services:
6161
- addresses-volume:/app/addresses # workdir in gateway's Dockerfile is /app
6262

6363
gateway-sc-trigger-keygen:
64-
container_name: gateway-sc-trigger-keygen
64+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-gateway-sc-trigger-keygen
6565
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
6666
build:
6767
context: ../../../gateway-contracts
@@ -86,7 +86,7 @@ services:
8686
- addresses-volume:/app/addresses # workdir in gateway's Dockerfile is /app
8787

8888
gateway-sc-trigger-crsgen:
89-
container_name: gateway-sc-trigger-crsgen
89+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-gateway-sc-trigger-crsgen
9090
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
9191
build:
9292
context: ../../../gateway-contracts

test-suite/fhevm/docker-compose/gateway-unpause-docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
gateway-sc-unpause:
3-
container_name: gateway-sc-unpause
3+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-gateway-sc-unpause
44
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
55
build:
66
context: ../../../gateway-contracts

test-suite/fhevm/docker-compose/host-node-docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
host-node:
3-
container_name: host-node
3+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-host-node
44
image: ghcr.io/foundry-rs/foundry:v1.3.5
55
env_file:
66
- ../env/staging/.env.host-node.local
@@ -19,4 +19,4 @@ services:
1919
- --mnemonic
2020
- "${MNEMONIC}"
2121
ports:
22-
- "8545:8545"
22+
- "${HOST_NODE_RPC_PORT:-8545}:8545"

test-suite/fhevm/docker-compose/host-pause-docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
host-sc-pause:
3-
container_name: host-sc-pause
3+
container_name: ${FHEVM_DOCKER_PROJECT:-fhevm}-host-sc-pause
44
image: ghcr.io/zama-ai/fhevm/host-contracts:${HOST_VERSION}
55
build:
66
context: ../../../host-contracts

0 commit comments

Comments
 (0)