From e85216b70be5ef9ff6e17a6a5bed55c123e4559b Mon Sep 17 00:00:00 2001 From: Danilo Tuler Date: Tue, 22 Jul 2025 19:38:48 -0400 Subject: [PATCH] feat(cli): fix ram_image default value --- .changeset/salty-hoops-move.md | 5 +++++ apps/cli/src/config.ts | 6 ++---- apps/cli/src/machine.ts | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 .changeset/salty-hoops-move.md diff --git a/.changeset/salty-hoops-move.md b/.changeset/salty-hoops-move.md new file mode 100644 index 00000000..4b5c4488 --- /dev/null +++ b/.changeset/salty-hoops-move.md @@ -0,0 +1,5 @@ +--- +"@cartesi/cli": patch +--- + +fix ram_image default value diff --git a/apps/cli/src/config.ts b/apps/cli/src/config.ts index 6764c0c8..723ac887 100644 --- a/apps/cli/src/config.ts +++ b/apps/cli/src/config.ts @@ -73,7 +73,6 @@ export class InvalidStringArrayError extends Error { */ const DEFAULT_FORMAT = "ext2"; const DEFAULT_RAM = "128Mi"; -const DEFAULT_RAM_IMAGE = "/usr/share/cartesi-machine/images/linux.bin"; export const DEFAULT_SDK_VERSION = "0.12.0-alpha.20"; export const DEFAULT_SDK_IMAGE = "cartesi/sdk"; export const PREFERRED_PORT = 6751; @@ -147,7 +146,7 @@ export type MachineConfig = { maxMCycle?: bigint; // default given by cartesi-machine noRollup?: boolean; // default given by cartesi-machine ramLength: string; - ramImage: string; + ramImage?: string; // default given by cartesi-machine useDockerEnv: boolean; // inject docker image ENV into cartesi-machine ENV useDockerWorkdir: boolean; // inject docker image WORKDIR into cartesi-machine WORKDIR user?: string; // default given by cartesi-machine @@ -178,7 +177,6 @@ export const defaultMachineConfig = (): MachineConfig => ({ maxMCycle: undefined, noRollup: undefined, ramLength: DEFAULT_RAM, - ramImage: DEFAULT_RAM_IMAGE, useDockerEnv: true, useDockerWorkdir: true, user: undefined, @@ -372,7 +370,7 @@ const parseMachine = (value: TomlPrimitive): MachineConfig => { maxMCycle: parseOptionalNumber(toml.max_mcycle), noRollup: parseBoolean(toml.no_rollup, false), ramLength: parseString(toml.ram_length, DEFAULT_RAM), - ramImage: parseString(toml.ram_image, DEFAULT_RAM_IMAGE), + ramImage: parseOptionalString(toml.ram_image), useDockerEnv: parseBoolean(toml.use_docker_env, true), useDockerWorkdir: parseBoolean(toml.use_docker_workdir, true), user: parseOptionalString(toml.user), diff --git a/apps/cli/src/machine.ts b/apps/cli/src/machine.ts index f9b9b3c9..f04fc8f0 100644 --- a/apps/cli/src/machine.ts +++ b/apps/cli/src/machine.ts @@ -88,9 +88,11 @@ export const bootMachine = ( ...bootargs, ...envs, ...flashDrives, - `--ram-image=${ramImage}`, `--ram-length=${ramLength}`, ]; + if (ramImage) { + args.push(`--ram-image=${ramImage}`); + } if (assertRollingTemplate) { args.push("--assert-rolling-template"); }