Merge branch 'main' into test-timeouts

Author: brooke-hamilton

.github/workflows/publish-dev-containers.yml

@@ -37,7 +37,7 @@ jobs:
         echo "TGZ=devcontainers-cli-${VERSION}.tgz" | tee -a $GITHUB_ENV
         echo "TGZ_UPLOAD=devcontainers-cli-${VERSION}-${GITHUB_SHA:0:8}.tgz" | tee -a $GITHUB_ENV
     - name: Download TGZ
-      uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
+      uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
       with:
         workflow: dev-containers.yml
         workflow_conclusion: success

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Notable changes.
 
+## April 2026
+
+### [0.86.0]
+- Bump basic-ftp from 5.2.0 to 5.2.2. (https://github.com/devcontainers/cli/pull/1201)
+- Always write devcontainer.metadata label as JSON array. (https://github.com/devcontainers/cli/pull/1199)
+- Normalize drive letter to lowercase on Windows to match VSCode. (https://github.com/devcontainers/cli/pull/1183)
+
 ## March 2026
 
 ### [0.85.0]

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@devcontainers/cli",
 	"description": "Dev Containers CLI",
-	"version": "0.85.0",
+	"version": "0.86.0",
 	"bin": {
 		"devcontainer": "devcontainer.js"
 	},

src/spec-node/imageMetadata.ts

@@ -497,11 +497,9 @@ export function getDevcontainerMetadataLabel(devContainerMetadata: SubstitutedCo
 	if (!metadata.length) {
 		return '';
 	}
-	const imageMetadataLabelValue = metadata.length !== 1
-		? `[${metadata
-			.map(feature => ` \\\n${toLabelString(feature)}`)
-			.join(',')} \\\n]`
-		: toLabelString(metadata[0]);
+	const imageMetadataLabelValue = `[${metadata
+		.map(feature => ` \\\n${toLabelString(feature)}`)
+		.join(',')} \\\n]`;
 	return `LABEL ${imageMetadataLabel}="${imageMetadataLabelValue}"`;
 }
 

src/spec-node/singleContainer.ts

@@ -20,7 +20,6 @@ export const configFileLabel = 'devcontainer.config_file';
 export async function openDockerfileDevContainer(params: DockerResolverParameters, configWithRaw: SubstitutedConfig<DevContainerFromDockerfileConfig | DevContainerFromImageConfig>, workspaceConfig: WorkspaceConfiguration, idLabels: string[], additionalFeatures: Record<string, string | boolean | Record<string, string | boolean>>): Promise<ResolverResult> {
 	const { common } = params;
 	const { config } = configWithRaw;
-	// let collapsedFeaturesConfig: () => Promise<CollapsedFeaturesConfig | undefined>;
 
 	let container: ContainerDetails | undefined;
 	let containerProperties: ContainerProperties | undefined;
@@ -30,14 +29,7 @@ export async function openDockerfileDevContainer(params: DockerResolverParameter
 		let imageMetadata: ImageMetadataEntry[];
 		let mergedConfig: MergedDevContainerConfig;
 		if (container) {
-			// let _collapsedFeatureConfig: Promise<CollapsedFeaturesConfig | undefined>;
-			// collapsedFeaturesConfig = async () => {
-			// 	return _collapsedFeatureConfig || (_collapsedFeatureConfig = (async () => {
-			// 		const allLabels = container?.Config.Labels || {};
-			// 		const featuresConfig = await generateFeaturesConfig(params.common, (await createFeaturesTempFolder(params.common)), config, async () => allLabels, getContainerFeaturesFolder);
-			// 		return collapseFeaturesConfig(featuresConfig);
-			// 	})());
-			// };
+
 			await startExistingContainer(params, idLabels, container);
 			imageMetadata = getImageMetadataFromContainer(container, configWithRaw, undefined, idLabels, common.output).config;
 			mergedConfig = mergeConfiguration(config, imageMetadata);
@@ -47,9 +39,6 @@ export async function openDockerfileDevContainer(params: DockerResolverParameter
 			mergedConfig = mergeConfiguration(config, imageMetadata);
 			const { containerUser } = mergedConfig;
 			const updatedImageName = await updateRemoteUserUID(params, mergedConfig, res.updatedImageName[0], res.imageDetails, findUserArg(config.runArgs) || containerUser);
-
-			// collapsedFeaturesConfig = async () => res.collapsedFeaturesConfig;
-
 			try {
 				await spawnDevContainer(params, config, mergedConfig, updatedImageName, idLabels, workspaceConfig.workspaceMount, workspaceConfig.additionalMountString, res.imageDetails, containerUser, res.labels || {});
 			} finally {
@@ -290,7 +279,7 @@ export function findUserArg(runArgs: string[] = []) {
 			return runArgs[i + 1];
 		}
 		if (runArg.startsWith('-u=') || runArg.startsWith('--user=')) {
-			return runArg.substr(runArg.indexOf('=') + 1);
+			return runArg.slice(runArg.indexOf('=') + 1);
 		}
 	}
 	return undefined;

src/test/imageMetadata.test.ts

@@ -432,6 +432,22 @@ describe('Image Metadata', function () {
 			assert.strictEqual(label.replace(/ \\\n/g, ''), `LABEL devcontainer.metadata="${JSON.stringify(expected).replace(/"/g, '\\"')}"`);
 		});
 
+		it('should create array label for single metadata entry (docker-compose with Dockerfile, no features)', () => {
+			// When there is only one metadata entry, the label should still be a JSON array.
+			// Regression test for https://github.com/devcontainers/cli/issues/1054
+			const label = getDevcontainerMetadataLabel(configWithRaw([
+				{
+					remoteUser: 'testUser',
+				}
+			]));
+			const expected = [
+				{
+					remoteUser: 'testUser',
+				}
+			];
+			assert.strictEqual(label.replace(/ \\\n/g, ''), `LABEL devcontainer.metadata="${JSON.stringify(expected).replace(/"/g, '\\"')}"`);
+		});
+
 		it('should merge metadata from devcontainer.json and features', () => {
 			const merged = mergeConfiguration({
 				configFilePath: URI.parse('file:///devcontainer.json'),

yarn.lock

@@ -639,9 +639,9 @@ base64-js@^1.3.1:
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 basic-ftp@^5.0.2:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.2.0.tgz#7c2dff63c918bde60e6bad1f2ff93dcf5137a40a"
-  integrity sha512-VoMINM2rqJwJgfdHq6RiUudKt2BV+FY5ZFezP/ypmwayk68+NzzAQy4XXLlqsGD4MCzq3DrmNFD/uUmBJuGoXw==
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.2.2.tgz#4cb2422deddf432896bdb3c9b8f13b944ad4842c"
+  integrity sha512-1tDrzKsdCg70WGvbFss/ulVAxupNauGnOlgpyjKzeQxzyllBLS0CGLV7tjIXTK3ZQA9/FBEm9qyFFN1bciA6pw==
 
 bl@^5.0.0:
   version "5.1.0"