Merge pull request #638 from dhhyi/fix/propagate-cache-from

samruddhikhandale · web-flow · commit 9d98f302cbea · 2024-04-12T08:51:21.000-07:00
Fix: propagate --cache-from to buildx build
diff --git a/src/spec-node/containerFeatures.ts b/src/spec-node/containerFeatures.ts
@@ -85,6 +85,9 @@ export async function extendImage(params: DockerResolverParameters, config: Subs
 		if (params.buildxCacheTo) {
 			args.push('--cache-to', params.buildxCacheTo);
 		}
+		if (!params.buildNoCache) {
+			params.additionalCacheFroms.forEach(cacheFrom => args.push('--cache-from', cacheFrom));
+		}
 
 		for (const buildContext in featureBuildInfo.buildKitContexts) {
 			args.push('--build-context', `${buildContext}=${featureBuildInfo.buildKitContexts[buildContext]}`);

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,9 @@ export async function extendImage(params: DockerResolverParameters, config: Subs`
`85`	`85`	`if (params.buildxCacheTo) {`
`86`	`86`	`args.push('--cache-to', params.buildxCacheTo);`
`87`	`87`	`}`
	`88`	`+ if (!params.buildNoCache) {`
	`89`	`+ params.additionalCacheFroms.forEach(cacheFrom => args.push('--cache-from', cacheFrom));`
	`90`	`+ }`
`88`	`91`
`89`	`92`	`for (const buildContext in featureBuildInfo.buildKitContexts) {`
`90`	`93`	args.push('--build-context', `${buildContext}=${featureBuildInfo.buildKitContexts[buildContext]}`);