fixup! Update balena-multibuild to 5.1.0

balena-io · Nov 5, 2021 · 2017bea · 2017bea
1 parent 8c5f8db
commit 2017bea
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/lib/utils/device/deploy.ts b/lib/utils/device/deploy.ts
@@ -528,15 +528,18 @@ async function assignDockerBuildOpts(
 	await Promise.all(
 		buildTasks.map(async (task: BuildTask) => {
 			task.dockerOpts = {
-				cachefrom: images,
-				labels: {
-					'io.resin.local.image': '1',
-					'io.resin.local.service': task.serviceName,
-				},
-				t: generateImageName(task.serviceName),
-				nocache: opts.nocache,
-				forcerm: true,
-				pull: opts.pull,
+				...(task.dockerOpts || {}),
+				...({
+					cachefrom: images,
+					labels: {
+						'io.resin.local.image': '1',
+						'io.resin.local.service': task.serviceName,
+					},
+					t: generateImageName(task.serviceName),
+					nocache: opts.nocache,
+					forcerm: true,
+					pull: opts.pull,
+				}),
 			};
 			if (task.external) {
 				task.dockerOpts.authconfig = await getAuthConfigObj(