Use existing additionalCacheFroms

Author: aledbf

src/spec-common/injectHeadless.ts

@@ -62,7 +62,6 @@ export interface ResolverParameters {
 	buildxPush: boolean;
 	buildxOutput: string | undefined;
 	buildxCacheTo: string | undefined;
-	buildxCacheFrom: string | undefined;
 	skipFeatureAutoMapping: boolean;
 	skipPostAttach: boolean;
 	containerSessionDataFolder?: string;

src/spec-node/containerFeatures.ts

@@ -89,10 +89,6 @@ export async function extendImage(params: DockerResolverParameters, config: Subs
 			params.additionalCacheFroms.forEach(cacheFrom => args.push('--cache-from', cacheFrom));
 		}
 
-		if (params.buildxCacheFrom) {
-			args.push('--cache-from', params.buildxCacheFrom);
-		}
-
 		for (const buildContext in featureBuildInfo.buildKitContexts) {
 			args.push('--build-context', `${buildContext}=${featureBuildInfo.buildKitContexts[buildContext]}`);
 		}

src/spec-node/devContainers.ts

@@ -54,7 +54,6 @@ export interface ProvisionOptions {
 	buildxPush: boolean;
 	buildxOutput: string | undefined;
 	buildxCacheTo: string | undefined;
-	buildxCacheFrom: string | undefined;
 	additionalFeatures?: Record<string, string | boolean | Record<string, string | boolean>>;
 	skipFeatureAutoMapping: boolean;
 	skipPostAttach: boolean;
@@ -145,7 +144,6 @@ export async function createDockerParams(options: ProvisionOptions, disposables:
 		buildxPush: options.buildxPush,
 		buildxOutput: options.buildxOutput,
 		buildxCacheTo: options.buildxCacheTo,
-		buildxCacheFrom: options.buildxCacheFrom,
 		skipFeatureAutoMapping: options.skipFeatureAutoMapping,
 		skipPostAttach: options.skipPostAttach,
 		containerSessionDataFolder: options.containerSessionDataFolder,

src/spec-node/devContainersSpecCLI.ts

@@ -265,7 +265,6 @@ async function provision({
 		buildxPush: false,
 		buildxOutput: undefined,
 		buildxCacheTo: addCacheTo,
-		buildxCacheFrom: addCacheFrom,
 		additionalFeatures,
 		skipFeatureAutoMapping,
 		skipPostAttach,
@@ -421,7 +420,6 @@ async function doSetUp({
 			buildxPush: false,
 			buildxOutput: undefined,
 			buildxCacheTo: undefined,
-			buildxCacheFrom: undefined,
 			skipFeatureAutoMapping: false,
 			skipPostAttach: false,
 			skipPersistingCustomizationsFromFeatures: false,
@@ -847,7 +845,6 @@ async function doRunUserCommands({
 			buildxPush: false,
 			buildxOutput: undefined,
 			buildxCacheTo: undefined,
-			buildxCacheFrom: undefined,
 			skipFeatureAutoMapping,
 			skipPostAttach,
 			skipPersistingCustomizationsFromFeatures: false,
@@ -1295,7 +1292,6 @@ export async function doExec({
 			buildxPlatform: undefined,
 			buildxPush: false,
 			buildxCacheTo: undefined,
-			buildxCacheFrom: undefined,
 			skipFeatureAutoMapping,
 			buildxOutput: undefined,
 			skipPostAttach: false,

src/spec-node/featuresCLI/testCommandImpl.ts

@@ -654,7 +654,6 @@ async function generateDockerParams(workspaceFolder: string, args: FeaturesTestC
 		buildxPush: false,
 		buildxOutput: undefined,
 		buildxCacheTo: undefined,
-		buildxCacheFrom: undefined,
 		skipFeatureAutoMapping: false,
 		skipPostAttach: false,
 		skipPersistingCustomizationsFromFeatures: false,

src/spec-node/singleContainer.ts

@@ -202,10 +202,6 @@ async function buildAndExtendImage(buildParams: DockerResolverParameters, config
 		if (buildParams.buildxCacheTo) {
 			args.push('--cache-to', buildParams.buildxCacheTo);
 		}
-		if (buildParams.buildxCacheFrom) {
-			args.push('--cache-from', buildParams.buildxCacheFrom);
-		}
-
 		args.push('--build-arg', 'BUILDKIT_INLINE_CACHE=1');
 	} else {
 		args.push('build');

src/spec-node/utils.ts

@@ -118,7 +118,6 @@ export interface DockerResolverParameters {
 	buildxPush: boolean;
 	buildxOutput: string | undefined;
 	buildxCacheTo: string | undefined;
-	buildxCacheFrom: string | undefined;
 	platformInfo: PlatformInfo;
 }