@iexec/iapp-maker 0.0.1-alpha-nightly-c808af829ce4b10cbbecdbc64ec7fa9b8cf3558d → 0.0.1-alpha-nightly-6be476717b877e4857383c375d5f209dbd288f99

package/README.md

@@ -14,6 +14,21 @@ This CLI provides an interface to guide you through different steps:
   (`iapp init` will also propose you to do so)
 - Docker
 
+> ℹ️ For MacOS users
+>
+> This tool use `docker buildx` to build images for `linux/amd64` platform
+> compatible with iExec's decentralized workers.
+>
+> Make sure your docker builder supports AMD64 architecture:
+>
+> ```sh
+> docker buildx inspect --bootstrap | grep -i platforms
+> ```
+>
+> The output should include `linux/amd64` in the list of supported platforms. If
+> not update te the latest Docker Desktop version which includes these
+> requirements.
+
 ## Install
 
 ```sh

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iexec/iapp-maker",
-  "version": "0.0.1-alpha-nightly-c808af829ce4b10cbbecdbc64ec7fa9b8cf3558d",
+  "version": "0.0.1-alpha-nightly-6be476717b877e4857383c375d5f209dbd288f99",
   "description": "A CLI to guide you through the process of building an iExec iApp",
   "main": "src/index.js",
   "type": "module",

package/src/cli-helpers/askForAppSecret.js

@@ -1,5 +1,6 @@
 import { readIAppConfig, writeIAppConfig } from '../utils/iAppConfigFile.js';
 import { CONFIG_FILE } from '../config/config.js';
+import * as color from './color.js';
 
 /**
  * @returns {Promise<string | null>}
@@ -9,11 +10,15 @@ export async function askForAppSecret({ spinner }) {
   const { appSecret: savedAppSecret } = config;
 
   if (savedAppSecret === null) {
-    spinner.log(`"No app secret" is configured (from "${CONFIG_FILE}")`);
+    spinner.log(
+      `"No app secret" is configured ${color.comment(`(from ${color.file(CONFIG_FILE)})`)}`
+    );
     return savedAppSecret;
   }
   if (savedAppSecret !== undefined) {
-    spinner.log(`Using saved appSecret (from "${CONFIG_FILE}")`);
+    spinner.log(
+      `Using saved appSecret ${color.comment(`(from ${color.file(CONFIG_FILE)})`)}`
+    );
     return savedAppSecret;
   }
 
@@ -37,7 +42,7 @@ export async function askForAppSecret({ spinner }) {
     if (saveNull) {
       config.appSecret = null;
       await writeIAppConfig(config);
-      spinner.log(`"No appSecret" choice saved to "${CONFIG_FILE}"`);
+      spinner.log(`"No appSecret" choice saved to ${color.file(CONFIG_FILE)}`);
     }
     return null;
   }
@@ -61,7 +66,7 @@ export async function askForAppSecret({ spinner }) {
   if (saveAppSecret) {
     config.appSecret = appSecret;
     await writeIAppConfig(config);
-    spinner.log(`appSecret saved to "${CONFIG_FILE}"`);
+    spinner.log(`appSecret saved to ${color.file(CONFIG_FILE)}`);
   }
 
   return appSecret;

package/src/cli-helpers/askForDockerhubAccessToken.js

@@ -1,40 +1,37 @@
-import chalk from 'chalk';
 import { readIAppConfig, writeIAppConfig } from '../utils/iAppConfigFile.js';
 import { CONFIG_FILE } from '../config/config.js';
+import * as color from './color.js';
 
 export async function askForDockerhubAccessToken({ spinner }) {
   const config = await readIAppConfig();
 
   const dockerhubAccessToken = config.dockerhubAccessToken || '';
   if (dockerhubAccessToken) {
-    spinner.log(`Using saved dockerhubAccessToken (from "${CONFIG_FILE}")`);
+    spinner.log(
+      `Using saved dockerhubAccessToken ${color.comment(`(from ${color.file(CONFIG_FILE)})`)}`
+    );
     return dockerhubAccessToken;
   }
 
-  spinner.log(
-    'Go to your docker hub account: https://hub.docker.com/settings/security'
-  );
-  spinner.log('click on "Personal access tokens"');
-  spinner.log('click on "Generate new token"');
-  spinner.log('you can name it "Test iExec iApp CLI"');
-  spinner.log('and select "Read & Write" Access permissions');
   const { dockerHubAccessTokenAnswer } = await spinner.prompt({
     type: 'password',
     name: 'dockerHubAccessTokenAnswer',
-    message:
-      'What is your DockerHub access token? (It will be used to push the docker image to your account)',
+    message: `What is your DockerHub access token?
+${color.promptHelper(`You need to provide a Personal access token with ${color.emphasis('Read & Write')} access
+This token will be used to push your iApp docker images to your account
+You can create a new token by visiting ${color.link('https://app.docker.com/settings/personal-access-tokens/create')}`)}`,
   });
 
   // TODO check token against API
   if (!/[a-zA-Z0-9-]+/.test(dockerHubAccessTokenAnswer)) {
-    spinner.log(chalk.red('Invalid DockerHub access token.'));
+    spinner.log(color.error('Invalid DockerHub access token.'));
     return askForDockerhubAccessToken({ spinner });
   }
 
   // Save it into JSON config file
   config.dockerhubAccessToken = dockerHubAccessTokenAnswer;
   await writeIAppConfig(config);
-  spinner.log(`dockerhubAccessToken saved to "${CONFIG_FILE}"`);
+  spinner.log(`dockerhubAccessToken saved to ${color.file(CONFIG_FILE)}`);
 
   return dockerHubAccessTokenAnswer;
 }

package/src/cli-helpers/askForDockerhubUsername.js

@@ -1,6 +1,6 @@
-import chalk from 'chalk';
 import { readIAppConfig, writeIAppConfig } from '../utils/iAppConfigFile.js';
 import { CONFIG_FILE } from '../config/config.js';
+import * as color from './color.js';
 
 export async function askForDockerhubUsername({ spinner }) {
   const config = await readIAppConfig();
@@ -8,7 +8,7 @@ export async function askForDockerhubUsername({ spinner }) {
   const dockerhubUsername = config.dockerhubUsername || '';
   if (dockerhubUsername) {
     spinner.log(
-      `Using saved dockerhubUsername (from "${CONFIG_FILE}") -> ${dockerhubUsername}`
+      `Using saved dockerhubUsername ${color.comment(`(from ${color.file(CONFIG_FILE)})`)} -> ${dockerhubUsername}`
     );
     return dockerhubUsername;
   }
@@ -16,15 +16,14 @@ export async function askForDockerhubUsername({ spinner }) {
   const { dockerHubUserNameAnswer } = await spinner.prompt({
     type: 'text',
     name: 'dockerHubUserNameAnswer',
-    message:
-      'What is your username on DockerHub? (It will be used to properly tag the Docker image)',
+    message: `What is your username on DockerHub? ${color.promptHelper('(It will be used to properly tag the Docker image)')}`,
   });
 
   // TODO check username against API
   if (!/[a-zA-Z0-9-]+/.test(dockerHubUserNameAnswer)) {
     spinner.log(
-      chalk.red(
-        'Invalid DockerHub username. Login to https://hub.docker.com/repositories, your username is what gets added to this URL.'
+      color.error(
+        `Invalid DockerHub username. Login to ${color.link('https://hub.docker.com')} to check your username.`
       )
     );
     return askForDockerhubUsername({ spinner });
@@ -33,7 +32,7 @@ export async function askForDockerhubUsername({ spinner }) {
   // Save it into JSON config file
   config.dockerhubUsername = dockerHubUserNameAnswer;
   await writeIAppConfig(config);
-  spinner.log(`dockerhubUsername saved to "${CONFIG_FILE}"`);
+  spinner.log(`dockerhubUsername saved to ${color.file(CONFIG_FILE)}`);
 
   return dockerHubUserNameAnswer;
 }

package/src/cli-helpers/askForWalletAddress.js

@@ -1,13 +1,15 @@
-import chalk from 'chalk';
+import { isAddress } from 'ethers';
 import { readIAppConfig, writeIAppConfig } from '../utils/iAppConfigFile.js';
 import { CONFIG_FILE } from '../config/config.js';
-import { isAddress } from 'ethers';
+import * as color from './color.js';
 
 export async function askForWalletAddress({ spinner }) {
   const config = await readIAppConfig();
   const walletAddress = config.walletAddress || '';
   if (walletAddress) {
-    spinner.log(`Using saved walletAddress (from "${CONFIG_FILE}")`);
+    spinner.log(
+      `Using saved walletAddress ${color.comment(`(from ${color.file(CONFIG_FILE)})`)}`
+    );
     return walletAddress;
   }
 
@@ -19,7 +21,7 @@ export async function askForWalletAddress({ spinner }) {
 
   if (!isAddress(walletAddressAnswer)) {
     spinner.log(
-      chalk.red(
+      color.error(
         'Invalid wallet address. Ex: 0xC248cCe0a656a90F2Ae27ccfa8Bd11843c8e0f3c'
       )
     );
@@ -29,7 +31,7 @@ export async function askForWalletAddress({ spinner }) {
   // Save it into JSON config file
   config.walletAddress = walletAddressAnswer;
   await writeIAppConfig(config);
-  spinner.log(`walletAddress saved to "${CONFIG_FILE}"`);
+  spinner.log(`walletAddress saved to ${color.file(CONFIG_FILE)}`);
 
   return walletAddressAnswer;
 }

package/src/cli-helpers/askForWalletPrivateKey.js

@@ -1,14 +1,16 @@
-import chalk from 'chalk';
 import { Wallet } from 'ethers';
 import { readIAppConfig, writeIAppConfig } from '../utils/iAppConfigFile.js';
 import { CONFIG_FILE } from '../config/config.js';
+import * as color from './color.js';
 
 export async function askForWalletPrivateKey({ spinner }) {
   const config = await readIAppConfig();
 
   const walletPrivateKey = config.walletPrivateKey || '';
   if (walletPrivateKey) {
-    spinner.log(`Using saved walletPrivateKey (from "${CONFIG_FILE}")`);
+    spinner.log(
+      `Using saved walletPrivateKey ${color.comment(`(from ${color.file(CONFIG_FILE)})`)}`
+    );
     return walletPrivateKey;
   }
 
@@ -22,7 +24,7 @@ export async function askForWalletPrivateKey({ spinner }) {
   try {
     new Wallet(walletPrivateKeyAnswer);
   } catch {
-    spinner.log(chalk.red('Invalid wallet private key'));
+    spinner.log(color.error('Invalid wallet private key'));
     return askForWalletPrivateKey({ spinner });
   }
 
@@ -41,7 +43,7 @@ export async function askForWalletPrivateKey({ spinner }) {
 
   config.walletPrivateKey = walletPrivateKeyAnswer;
   await writeIAppConfig(config);
-  spinner.log(`walletPrivateKey saved to "${CONFIG_FILE}"`);
+  spinner.log(`walletPrivateKey saved to ${color.file(CONFIG_FILE)}`);
 
   return walletPrivateKeyAnswer;
 }

package/src/cli-helpers/askShowResult.js

@@ -1,12 +1,13 @@
 import { readdir } from 'node:fs/promises';
 import { getDeterministicOutputAsText } from '../utils/deterministicOutput.js';
+import * as color from './color.js';
 
 export async function askShowResult({ spinner, outputPath }) {
   // Prompt user to view result
   const continueAnswer = await spinner.prompt({
     type: 'confirm',
     name: 'continue',
-    message: `Would you like to see the result? (View ./${outputPath}/)`,
+    message: `Would you like to see the result? ${color.promptHelper(`(View ${color.file(`./${outputPath}/`)})`)}`,
     initial: true,
   });
   if (continueAnswer.continue) {
@@ -16,13 +17,13 @@ export async function askShowResult({ spinner, outputPath }) {
       spinner.warn('output directory is empty');
     } else {
       spinner.info(
-        `output directory content:\n${files.map((file) => '  - ' + file).join('\n')}`
+        `output directory content:\n${files.map((file) => '  - ' + color.file(file)).join('\n')}`
       );
       // best effort display deterministic output file if it's an utf8 encoded file
       await getDeterministicOutputAsText({ outputPath })
         .then(({ text, path }) => {
           spinner.newLine();
-          spinner.info(`${path}:\n${text}`);
+          spinner.info(`${color.file(path)}:\n${text}`);
         })
         .catch(() => {});
     }

package/src/cli-helpers/box.js

@@ -0,0 +1,14 @@
+import boxen from 'boxen';
+
+export function hintBox(message) {
+  return boxen(message, {
+    padding: 1,
+    margin: 1,
+    borderStyle: 'round',
+    borderColor: 'cyan',
+  });
+}
+
+export function objectBox(message) {
+  return boxen(message, { margin: 1 });
+}

package/src/cli-helpers/color.js

@@ -20,3 +20,11 @@ export const emphasis = chalk.green;
  * use to color file name
  */
 export const file = chalk.cyan;
+/**
+ * use to color web links
+ */
+export const link = chalk.blue.underline;
+/**
+ * use to color errors
+ */
+export const error = chalk.red;

package/src/cmd/deploy.js

@@ -15,6 +15,8 @@ import { askForWalletPrivateKey } from '../cli-helpers/askForWalletPrivateKey.js
 import { Wallet } from 'ethers';
 import { getIExecDebug } from '../utils/iexec.js';
 import { goToProjectRoot } from '../cli-helpers/goToProjectRoot.js';
+import * as color from '../cli-helpers/color.js';
+import { hintBox } from '../cli-helpers/box.js';
 
 export async function deploy() {
   const spinner = getSpinner();
@@ -67,7 +69,7 @@ export async function deploy() {
       tag: imageTag,
       progressCallback: (msg) => {
         buildLogs.push(msg); // do we want to show build logs after build is successful?
-        spinner.text = spinner.text + msg;
+        spinner.text = spinner.text + color.comment(msg);
       },
     });
     spinner.succeed(`Docker image built (${imageId}) and tagged ${imageTag}`);
@@ -78,7 +80,7 @@ export async function deploy() {
       dockerhubAccessToken,
       dockerhubUsername,
       progressCallback: (msg) => {
-        spinner.text = spinner.text + msg;
+        spinner.text = spinner.text + color.comment(msg);
       },
     });
     spinner.succeed(`Pushed image ${imageTag} on dockerhub`);
@@ -104,6 +106,12 @@ export async function deploy() {
   - Docker image: ${sconifiedImage}
   - iApp address: ${appContractAddress}`
     );
+
+    spinner.log(
+      hintBox(
+        `Run ${color.command(`iapp run ${appContractAddress}`)} to execute your iApp on an iExec TEE worker`
+      )
+    );
   } catch (error) {
     handleCliError({ spinner, error });
   }

package/src/cmd/init.js

@@ -1,5 +1,4 @@
 import chalk from 'chalk';
-import boxen from 'boxen';
 import figlet from 'figlet';
 import { mkdir } from 'node:fs/promises';
 import { folderExists } from '../utils/fs.utils.js';
@@ -8,6 +7,7 @@ import { getSpinner } from '../cli-helpers/spinner.js';
 import { handleCliError } from '../cli-helpers/handleCliError.js';
 import { generateWallet } from '../utils/generateWallet.js';
 import * as color from '../cli-helpers/color.js';
+import { hintBox } from '../cli-helpers/box.js';
 
 const targetDir = 'hello-world';
 
@@ -170,14 +170,7 @@ export async function init() {
     ${color.command('$ iapp run <iapp-address>')}
   `;
 
-    spinner.log(
-      boxen(output, {
-        padding: 1,
-        margin: 1,
-        borderStyle: 'round',
-        borderColor: 'cyan',
-      })
-    );
+    spinner.log(hintBox(output));
   } catch (error) {
     handleCliError({ spinner, error });
   }

package/src/cmd/mock-protected-data.js

@@ -1,7 +1,5 @@
 import { mkdir, readFile, stat, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import chalk from 'chalk';
-import boxen from 'boxen';
 import { getSpinner } from '../cli-helpers/spinner.js';
 import { fileExists } from '../utils/fs.utils.js';
 import { PROTECTED_DATA_MOCK_DIR } from '../config/config.js';
@@ -12,6 +10,8 @@ import {
   ALLOWED_KEY_NAMES_REGEXP,
 } from '../libs/dataprotector.js';
 import { goToProjectRoot } from '../cli-helpers/goToProjectRoot.js';
+import * as color from '../cli-helpers/color.js';
+import { hintBox, objectBox } from '../cli-helpers/box.js';
 
 export async function mockProtectedData() {
   const spinner = getSpinner();
@@ -163,7 +163,7 @@ export async function mockProtectedData() {
 
       spinner.info(
         `This is how your protectedData looks so far:
-${boxen(JSON.stringify(dataSchema, null, 2), { margin: 1 })}`
+${objectBox(JSON.stringify(dataSchema, null, 2))}`
       );
 
       const { addMore } = await spinner.prompt([
@@ -196,7 +196,7 @@ ${boxen(JSON.stringify(dataSchema, null, 2), { margin: 1 })}`
     }
 
     spinner.start(
-      `Creating protectedData mock file in \`${PROTECTED_DATA_MOCK_DIR}\` directory...`
+      `Creating protectedData mock file in ${color.file(PROTECTED_DATA_MOCK_DIR)} directory...`
     );
 
     const unencryptedData = await createZipFromObject(data);
@@ -204,21 +204,15 @@ ${boxen(JSON.stringify(dataSchema, null, 2), { margin: 1 })}`
     await mkdir(PROTECTED_DATA_MOCK_DIR, { recursive: true });
     await writeFile(join(PROTECTED_DATA_MOCK_DIR, mockName), unencryptedData);
     spinner.succeed(
-      `Mocked protectedData "${mockName}" created in \`${PROTECTED_DATA_MOCK_DIR}\` directory`
+      `Mocked protectedData ${color.file(mockName)} created in ${color.file(PROTECTED_DATA_MOCK_DIR)} directory`
     );
     spinner.log(
-      boxen(
+      hintBox(
         `protectedData mock "${mockName}" schema:
-${chalk.yellow(boxen(JSON.stringify(schema, null, 2)))}
+${color.command(objectBox(JSON.stringify(schema, null, 2)))}
 
 Use your mock in tests:
-${chalk.yellow(`iapp test --protectedData "${mockName}"`)}`,
-        {
-          padding: 1,
-          margin: 1,
-          borderStyle: 'round',
-          borderColor: 'cyan',
-        }
+${color.command(`iapp test --protectedData "${mockName}"`)}`
       )
     );
   } catch (error) {

package/src/cmd/run.js

@@ -1,4 +1,3 @@
-import chalk from 'chalk';
 import { v4 as uuidV4 } from 'uuid';
 import { ethers } from 'ethers';
 import { mkdir, rm } from 'node:fs/promises';
@@ -16,6 +15,7 @@ import { getIExecDebug } from '../utils/iexec.js';
 import { extractZipToFolder } from '../utils/extractZipToFolder.js';
 import { askShowResult } from '../cli-helpers/askShowResult.js';
 import { goToProjectRoot } from '../cli-helpers/goToProjectRoot.js';
+import * as color from '../cli-helpers/color.js';
 
 export async function run({
   iAppAddress,
@@ -51,23 +51,17 @@ export async function runInDebug({
 }) {
   // Is valid iApp address
   if (!ethers.isAddress(iAppAddress)) {
-    spinner.log(
-      chalk.red(
-        'The iApp address is invalid. Be careful ENS name is not implemented yet ...'
-      )
+    throw Error(
+      'The iApp address is invalid. Be careful ENS name is not implemented yet ...'
     );
-    return;
   }
 
   if (protectedData) {
     // Is valid protectedData address
     if (!ethers.isAddress(protectedData)) {
-      spinner.log(
-        chalk.red(
-          'The protectedData address is invalid. Be careful ENS name is not implemented yet ...'
-        )
+      throw Error(
+        'The protectedData address is invalid. Be careful ENS name is not implemented yet ...'
       );
-      return;
     }
   }
 
@@ -89,18 +83,13 @@ export async function runInDebug({
       );
 
       if (!isSecretSet) {
-        spinner.log(
-          chalk.red(
-            `Your protectedData secret key is not registered in the debug secret management service (SMS) of iexec protocol`
-          )
+        throw Error(
+          `Your protectedData secret key is not registered in the debug secret management service (SMS) of iexec protocol`
         );
-        return;
       }
     } catch (e) {
-      spinner.log(
-        chalk.red(
-          `Error while running your iApp with your protectedData: ${e.message}`
-        )
+      throw Error(
+        `Error while running your iApp with your protectedData: ${e.message}`
       );
     }
   }
@@ -130,9 +119,9 @@ export async function runInDebug({
   });
   const workerpoolorder = workerpoolOrderbook.orders[0]?.order;
   if (!workerpoolorder) {
-    spinner.fail('No WorkerpoolOrder found');
-    spinner.log(chalk.red('Wait until some workerpoolOrder come back'));
-    return;
+    throw Error(
+      'No WorkerpoolOrder found, Wait until some workerpoolOrder come back'
+    );
   }
   spinner.succeed('Workerpool order fetched');
 
@@ -163,13 +152,9 @@ export async function runInDebug({
     );
     datasetorder = datasetOrderbook.orders[0]?.order;
     if (!datasetorder) {
-      spinner.fail('No matching ProtectedData access found');
-      spinner.log(
-        chalk.red(
-          'It seems your iApp is not allowed to access the protectedData, please grantAccess to it'
-        )
+      throw Error(
+        'No matching ProtectedData access found, It seems your iApp is not allowed to access the protectedData, please grantAccess to it'
       );
-      return;
     }
     spinner.succeed('ProtectedData access found');
   }
@@ -223,14 +208,9 @@ export async function runInDebug({
     clearTimeout(taskTimeoutWarning);
   });
 
-  spinner.succeed('Task finalized');
-
   const task = await iexec.task.show(taskId);
-  spinner.log(
-    chalk.green(
-      `You can download the result of your task here: https://ipfs-gateway.v8-bellecour.iex.ec${task?.results?.location}`
-    )
-  );
+  spinner.succeed(`Task finalized
+You can download the result of your task here: ${color.link(`https://ipfs-gateway.v8-bellecour.iex.ec${task?.results?.location}`)}`);
 
   const downloadAnswer = await spinner.prompt({
     type: 'confirm',
@@ -248,7 +228,7 @@ export async function runInDebug({
   const taskResult = await iexec.task.fetchResults(taskId);
   const resultBuffer = await taskResult.arrayBuffer();
   await extractZipToFolder(resultBuffer, outputFolder);
-  spinner.succeed(`Result downloaded to ${outputFolder}`);
+  spinner.succeed(`Result downloaded to ${color.file(outputFolder)}`);
 
   await askShowResult({ spinner, outputPath: outputFolder });
 }

package/src/cmd/test.js

@@ -23,6 +23,8 @@ import { askForAppSecret } from '../cli-helpers/askForAppSecret.js';
 import { askShowResult } from '../cli-helpers/askShowResult.js';
 import { copy, fileExists } from '../utils/fs.utils.js';
 import { goToProjectRoot } from '../cli-helpers/goToProjectRoot.js';
+import * as color from '../cli-helpers/color.js';
+import { hintBox } from '../cli-helpers/box.js';
 
 export async function test({
   args,
@@ -47,6 +49,12 @@ export async function test({
     });
     await checkTestOutput({ spinner });
     await askShowResult({ spinner, outputPath: TEST_OUTPUT_DIR });
+    // TODO: check test warnings and errors and adapt the message
+    spinner.log(
+      hintBox(
+        `When ready run ${color.command(`iapp deploy`)} to transform you app into a TEE app and deploy it on iExec`
+      )
+    );
   } catch (error) {
     handleCliError({ spinner, error });
   }
@@ -105,7 +113,7 @@ export async function testApp({
   const imageId = await dockerBuild({
     isForTest: true,
     progressCallback: (msg) => {
-      spinner.text = spinner.text + msg;
+      spinner.text = spinner.text + color.comment(msg);
     },
   });
   spinner.succeed(`App docker image built (${imageId})`);
@@ -129,7 +137,7 @@ export async function testApp({
     const mockExists = await fileExists(protectedDataMockPath);
     if (!mockExists) {
       throw Error(
-        `No protectedData mock "${protectedDataMock}" found in ${PROTECTED_DATA_MOCK_DIR}, run \`iapp mock protectedData\` to create a new protectedData mock`
+        `No protectedData mock "${protectedDataMock}" found in ${PROTECTED_DATA_MOCK_DIR}, run ${color.command('iapp mock protectedData')} to create a new protectedData mock`
       );
     }
     await copy(
@@ -187,7 +195,7 @@ export async function testApp({
     memory: IEXEC_WORKER_HEAP_SIZE,
     logsCallback: (msg) => {
       appLogs.push(msg); // collect logs for future use
-      spinner.text = spinner.text + msg; // and display realtime while app is running
+      spinner.text = spinner.text + color.comment(msg); // and display realtime while app is running
     },
   }).finally(() => {
     clearTimeout(taskTimeoutWarning);
@@ -195,7 +203,7 @@ export async function testApp({
   if (outOfMemory) {
     spinner.fail(
       `App docker image container ran out of memory.
-  iExec worker's ${Math.floor(IEXEC_WORKER_HEAP_SIZE / (1024 * 1024))}Mb memory limit exceeded.
+  iExec worker's ${Math.floor(IEXEC_WORKER_HEAP_SIZE / (1024 * 1024))}MiB memory limit exceeded.
   You must refactor your app to run within the memory limit.`
     );
   } else if (exitCode === 0) {
@@ -213,7 +221,7 @@ export async function testApp({
     const showLogs = await spinner.prompt({
       type: 'confirm',
       name: 'continue',
-      message: `Would you like to see the app logs? (${appLogs.length} lines)`,
+      message: `Would you like to see the app logs? ${color.promptHelper(`(${appLogs.length} lines)`)}`,
       initial: false,
     });
     if (showLogs.continue) {

package/src/execDocker/docker.js

@@ -24,22 +24,19 @@ export async function dockerBuild({
     src: ['./'],
   };
 
-  let platform;
-  if (osType === 'Darwin') {
-    // For MacOS
-    if (isForTest) {
-      // ARM64 variant for local testing only
-      platform = 'linux/arm64';
-    } else {
-      // AMD64 variant to deploy to iExec stack
-      platform = 'linux/amd64';
-    }
+  // by default force to build amd64 image which is architecture used in iExec workers
+  // this require buildx builder to support 'linux/amd64' (some devices may need QEMU for amd64 architecture emulation)
+  let platform = 'linux/amd64';
+  // for MacOS local testing only build arm64 variant
+  if (osType === 'Darwin' && isForTest) {
+    platform = 'linux/arm64';
   }
 
   // Perform the Docker build operation
   const buildImageStream = await docker.buildImage(buildArgs, {
     t: tag,
     platform,
+    pull: true, // docker store does not support multi platform image, this can cause issues when switching build target platform, pulling ensures the right image is used
   });
 
   const imageId = await new Promise((resolve, reject) => {

package/src/index.js

@@ -110,7 +110,7 @@ yargsInstance
   // Run a published docker image
   .command(
     'run <iAppAddress>',
-    'Run your iApp',
+    'Run your deployed iApp',
     (yargs) => {
       return yargs
         .positional('iAppAddress', {

package/src/utils/initIAppWorkspace.js

@@ -91,6 +91,9 @@ async function copyChosenTemplateFiles({
   const files = await fs.readdir(templateDir);
   await Promise.all(files.map((file) => write(file)));
 
+  // rename _.gitignore (npm does not allow publishing files named .gitignore in a package)
+  await fs.rename('_.gitignore', '.gitignore');
+
   // transform template: remove unwanted feature code inside " // <<feature>> ... // <</feature>>" tags
   const code = (await fs.readFile(srcFile)).toString('utf8');
   let modifiedCode = code;

package/templates/js/_.gitignore

@@ -0,0 +1,9 @@
+# iapp config file may contain secrets
+iapp.config.json
+
+# dependencies
+node_modules
+
+# test directories
+input
+output