Skip to content

Commit f350102

Browse files
committed
refactor(cli): compose image definition in a single place
1 parent b4e999f commit f350102

File tree

8 files changed

+33
-7
lines changed

8 files changed

+33
-7
lines changed

.changeset/selfish-dots-perform.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@cartesi/cli": patch
3+
---
4+
5+
refactor: single place to define the cartesi/sdk and cartesi/rollups-node image

apps/cli/src/commands/run.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,12 @@ export default class Run extends BaseCommand<typeof Run> {
123123
CARTESI_VALIDATOR_MEMORY: flags.memory?.toString(),
124124
};
125125

126+
// base
127+
const composeFiles = ["docker-compose-base.yaml"];
128+
126129
// validator
127-
const composeFiles = ["docker-compose-validator.yaml"];
130+
composeFiles.push("docker-compose-validator.yaml");
131+
128132
if (flags.cpus) {
129133
composeFiles.push("docker-compose-validator-cpus.yaml");
130134
}

apps/cli/src/node/docker-compose-anvil.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
services:
22
anvil:
3-
image: cartesi/sdk:0.12.0-alpha.5
3+
extends:
4+
file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
5+
service: sdk_image
46
command:
57
[
68
"devnet",
@@ -19,7 +21,9 @@ services:
1921
- 8545:8545
2022

2123
dapp_deployer:
22-
image: cartesi/rollups-node:devel
24+
extends:
25+
file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
26+
service: rollups_node_image
2327
restart: on-failure
2428
depends_on:
2529
validator:
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
sdk_image:
3+
image: cartesi/sdk:0.12.0-alpha.5
4+
rollups_node_image:
5+
image: cartesi/rollups-node:2.0.0

apps/cli/src/node/docker-compose-bundler.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
services:
22
alto:
3-
image: cartesi/sdk:0.12.0-alpha.5
3+
extends:
4+
file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
5+
service: sdk_image
46
command:
57
- "alto"
68
- "--entrypoints"

apps/cli/src/node/docker-compose-database.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ services:
1010
- POSTGRES_PASSWORD=password
1111

1212
migration:
13-
image: cartesi/rollups-node:devel
13+
extends:
14+
file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
15+
service: rollups_node_image
1416
command:
1517
- /bin/bash
1618
- -c

apps/cli/src/node/docker-compose-paymaster.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
services:
22
mock-verifying-paymaster:
3-
image: cartesi/sdk:0.12.0-alpha.5
3+
extends:
4+
file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
5+
service: sdk_image
46
command: "mock-verifying-paymaster"
57
environment:
68
- ALTO_RPC=http://alto:4337

apps/cli/src/node/docker-compose-validator.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
services:
22
validator:
3-
image: cartesi/rollups-node:devel
3+
extends:
4+
file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
5+
service: rollups_node_image
46
depends_on:
57
migration:
68
condition: service_completed_successfully

0 commit comments

Comments
 (0)