Adopt additional_contexts in compose (microsoft/vscode-remote-release…

…#7305)
devcontainers · Dec 12, 2023 · 09e9821 · 09e9821
1 parent a48200c
commit 09e9821
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/spec-node/dockerCompose.ts b/src/spec-node/dockerCompose.ts
@@ -182,8 +182,10 @@ export async function buildAndExtendDockerCompose(configWithRaw: SubstitutedConf
 	}
 
 	// determine whether we need to extend with features
-	const noBuildKitParams = { ...params, buildKitVersion: undefined }; // skip BuildKit -> can't set additional build contexts with compose
-	const extendImageBuildInfo = await getExtendImageBuildInfo(noBuildKitParams, configWithRaw, baseName, imageBuildInfo, composeService.user, additionalFeatures, canAddLabelsToContainer);
+	const version = parseVersion((await params.dockerComposeCLI()).version);
+	const supportsAdditionalBuildContexts = version && !isEarlierVersion(version, [2, 17, 0]);
+	const optionalBuildKitParams = supportsAdditionalBuildContexts ? params : { ...params, buildKitVersion: undefined };
+	const extendImageBuildInfo = await getExtendImageBuildInfo(optionalBuildKitParams, configWithRaw, baseName, imageBuildInfo, composeService.user, additionalFeatures, canAddLabelsToContainer);
 
 	let overrideImageName: string | undefined;
 	let buildOverrideContent = '';
@@ -229,6 +231,13 @@ export async function buildAndExtendDockerCompose(configWithRaw: SubstitutedConf
 				buildOverrideContent += `        - ${buildArg}=${featureBuildInfo.buildArgs[buildArg]}\n`;
 			}
 		}
+
+		if (Object.keys(featureBuildInfo.buildKitContexts).length > 0) {
+			buildOverrideContent += '      additional_contexts:\n';
+			for (const buildKitContext in featureBuildInfo.buildKitContexts) {
+				buildOverrideContent += `        - ${buildKitContext}=${featureBuildInfo.buildKitContexts[buildKitContext]}\n`;
+			}
+		}
 	}
 
 	// Generate the docker-compose override and build