Disable cache on feature build when specified

robjackstewart · robjackstewart · commit 118d4ce0ab5f · 2024-04-02T11:36:24.000Z
diff --git a/src/spec-node/containerFeatures.ts b/src/spec-node/containerFeatures.ts
@@ -82,7 +82,7 @@ export async function extendImage(params: DockerResolverParameters, config: Subs
 				args.push('--load'); // (short for --output=docker, i.e. load into normal 'docker images' collection)
 			}
 		}
-		if (params.buildxCacheTo) {
+		if (params.buildxCacheTo && !params.buildNoCache) {
 			args.push('--cache-to', params.buildxCacheTo);
 		}
 
@@ -95,6 +95,9 @@ export async function extendImage(params: DockerResolverParameters, config: Subs
 			'build',
 		);
 	}
+	if (params.buildNoCache) {
+		args.push('--no-cache');
+	}
 	for (const buildArg in featureBuildInfo.buildArgs) {
 		args.push('--build-arg', `${buildArg}=${featureBuildInfo.buildArgs[buildArg]}`);
 	}

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ export async function extendImage(params: DockerResolverParameters, config: Subs`
`82`	`82`	`args.push('--load'); // (short for --output=docker, i.e. load into normal 'docker images' collection)`
`83`	`83`	`}`
`84`	`84`	`}`
`85`		`- if (params.buildxCacheTo) {`
	`85`	`+ if (params.buildxCacheTo && !params.buildNoCache) {`
`86`	`86`	`args.push('--cache-to', params.buildxCacheTo);`
`87`	`87`	`}`
`88`	`88`
`@@ -95,6 +95,9 @@ export async function extendImage(params: DockerResolverParameters, config: Subs`
`95`	`95`	`'build',`
`96`	`96`	`);`
`97`	`97`	`}`
	`98`	`+ if (params.buildNoCache) {`
	`99`	`+ args.push('--no-cache');`
	`100`	`+ }`
`98`	`101`	`for (const buildArg in featureBuildInfo.buildArgs) {`
`99`	`102`	args.push('--build-arg', `${buildArg}=${featureBuildInfo.buildArgs[buildArg]}`);
`100`	`103`	`}`