fixup! feat(cli): build based on configuration

cartesi · Oct 7, 2024 · 2ca70a3 · 2ca70a3
1 parent c28d308
commit 2ca70a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/apps/cli/src/commands/build.ts b/apps/cli/src/commands/build.ts
@@ -60,7 +60,7 @@ const bootMachine = async (
     // list of environment variables of docker image
     const env = info?.env ?? [];
     const envs = env.map(
-        (variable) => `--append-entrypoint="export ${variable}"`,
+        (variable) => `--append-entrypoint=export "${variable}"`,
     );
 
     // bootargs from config string array
@@ -105,10 +105,10 @@ const bootMachine = async (
         `--ram-length=${ramLength}`,
         "--final-hash",
         "--store=image",
-        `--append-entrypoint="${entrypoint}"`,
+        `--append-entrypoint=${entrypoint}`,
     ];
     if (info?.workdir) {
-        args.push(`--append-init="WORKDIR=${info.workdir}"`);
+        args.push(`--append-init=WORKDIR="${info.workdir}"`);
     }
     if (noRollup) {
         args.push("--no-rollup");
@@ -123,6 +123,7 @@ const bootMachine = async (
     return execaDockerFallback(command, args, {
         cwd: destination,
         image: sdkImage,
+        stdio: "inherit",
     });
 };
 

diff --git a/apps/cli/src/exec.ts b/apps/cli/src/exec.ts
@@ -18,6 +18,9 @@ export const execaDockerFallback = async (
     } catch (error) {
         if (error instanceof ExecaError) {
             if (error.code === "ENOENT" && options.image) {
+                console.warn(
+                    `error executing '${command}', falling back to docker execution using image '${options.image}'`,
+                );
                 return await execa(
                     "docker",
                     [
@@ -32,6 +35,8 @@ export const execaDockerFallback = async (
                     ],
                     options,
                 );
+            } else {
+                console.error(`error executing '${command}'`, error);
             }
         }
         throw error;