@iexec/iapp-maker 0.0.1-alpha-nightly-79e0105f6025d93833a45abc311c73fb2b5b6c26 → 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-79e0105f6025d93833a45abc311c73fb2b5b6c26",
+  "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/cmd/test.js

@@ -113,7 +113,7 @@ export async function testApp({
   const imageId = await dockerBuild({
     isForTest: true,
     progressCallback: (msg) => {
-      spinner.text = spinner.text + +color.comment(msg);
+      spinner.text = spinner.text + color.comment(msg);
     },
   });
   spinner.succeed(`App docker image built (${imageId})`);

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/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