Merge pull request #62 from balena-io-modules/stringified-cachefrom

JSON stringify cachefrom option for builds
balena-io-modules · Feb 27, 2025 · 7ec27fa · 7ec27fa
2 parents 1bb90bb + 1b9d908
commit 7ec27fa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
@@ -4,13 +4,13 @@ on:
   pull_request:
     types: [opened, synchronize, closed]
     branches:
-      - "main"
-      - "master"
+      - 'main'
+      - 'master'
   pull_request_target:
     types: [opened, synchronize, closed]
     branches:
-      - "main"
-      - "master"
+      - 'main'
+      - 'master'
 
 jobs:
   flowzone:
@@ -26,3 +26,8 @@ jobs:
         github.event_name == 'pull_request_target'
       )
     secrets: inherit
+    with:
+      runs_on: >
+        [
+          "self-hosted", "X64"
+        ]
diff --git a/lib/multibuild/utils.ts b/lib/multibuild/utils.ts
@@ -78,7 +78,9 @@ export function generateBuildTasks(
 				// translating to dockerode ImageBuildOptions properties
 				{
 					dockerOpts: {
-						...(cachefrom ? { cachefrom } : {}),
+						// TODO: JSON serialization should no longer be necessary
+						// if https://github.com/apocas/dockerode/pull/793 is merged
+						...(cachefrom ? { cachefrom: JSON.stringify(cachefrom) } : {}),
 						...(shmsize ? { shmsize } : {}),
 						...(target ? { target } : {}),
 						...(extrahosts ? { extrahosts } : {}),

diff --git a/test/multibuild/build.spec.ts b/test/multibuild/build.spec.ts
@@ -693,7 +693,7 @@ describe('Specifying build options', async () => {
 			expect(newTask)
 				.to.have.property('dockerOpts')
 				.that.has.property('cachefrom')
-				.that.deep.equals(['alpine:latest']);
+				.that.deep.equals(JSON.stringify(['alpine:latest']));
 
 			expect(image).to.not.have.property('error');
 		});