Merge branch 'devcontainers:main' into main

Author: garymacindoe

.github/dependabot.yml

@@ -18,9 +18,13 @@ updates:
           - "*"
     ignore:
       - dependency-name: "@stylistic/eslint-plugin"
-        update-types: ["version-update:semver-major"] # stylistic 4 to avoid esm
+        update-types: ["version-update:semver-major"] # stylistic 3 to avoid esm
+      - dependency-name: "@types/chai"
+        update-types: ["version-update:semver-major"] # chai 4 to avoid esm
       - dependency-name: "@types/node"
         update-types: ["version-update:semver-major"] # Keep Node 18 compatibility
+      - dependency-name: "@types/tar"
+        update-types: ["version-update:semver-major"] # tar 6 for source compatibility
       - dependency-name: "chai"
         update-types: ["version-update:semver-major"] # chai 4 to avoid esm
       - dependency-name: "eslint"

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Notable changes.
 
+## April 2025
+
+### [0.76.0]
+- Fix: Add Podman options (https://github.com/microsoft/vscode-remote-release/issues/10798)
+- Fix: Restore accidental robustness towards numbers (https://github.com/microsoft/vscode-remote-release/issues/10691)
+
 ## March 2025
 
 ### [0.75.0]

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@devcontainers/cli",
 	"description": "Dev Containers CLI",
-	"version": "0.75.0",
+	"version": "0.76.0",
 	"bin": {
 		"devcontainer": "devcontainer.js"
 	},
@@ -55,7 +55,7 @@
 	],
 	"devDependencies": {
 		"@stylistic/eslint-plugin": "^3.0.1",
-		"@types/chai": "^5.2.0",
+		"@types/chai": "^4.3.20",
 		"@types/chalk": "^2.2.4",
 		"@types/follow-redirects": "^1.14.4",
 		"@types/js-yaml": "^4.0.9",

src/spec-node/dockerCompose.ts

@@ -557,7 +557,7 @@ while sleep 1 & wait $$!; do :; done", "-"${userEntrypoint.map(a => `, ${JSON.st
     init: true` : ''}${user ? `
     user: ${user}` : ''}${Object.keys(env).length ? `
     environment:${Object.keys(env).map(key => `
-      - '${key}=${env[key].replace(/\n/g, '\\n').replace(/\$/g, '$$$$').replace(/'/g, '\'\'')}'`).join('')}` : ''}${mergedConfig.privileged ? `
+      - '${key}=${String(env[key]).replace(/\n/g, '\\n').replace(/\$/g, '$$$$').replace(/'/g, '\'\'')}'`).join('')}` : ''}${mergedConfig.privileged ? `
     privileged: true` : ''}${capAdd.length ? `
     cap_add:${capAdd.map(cap => `
       - ${cap}`).join('')}` : ''}${securityOpts.length ? `

src/spec-node/singleContainer.ts

@@ -409,6 +409,7 @@ while sleep 1 & wait $!; do :; done`, '-']; // `wait $!` allows for the `trap` t
 		...getLabels(labels),
 		...containerEnv,
 		...containerUserArgs,
+		...getPodmanArgs(params),
 		...(config.runArgs || []),
 		...(await extraRunArgs(common, params, config) || []),
 		...featureArgs,
@@ -433,6 +434,13 @@ while sleep 1 & wait $!; do :; done`, '-']; // `wait $!` allows for the `trap` t
 	common.output.stop(text, start);
 }
 
+function getPodmanArgs(params: DockerResolverParameters): string[] {
+	if (params.isPodman && params.common.cliHost.platform === 'linux') {
+		return ['--security-opt', 'label=disable', '--userns=keep-id'];
+	}
+	return [];
+}
+
 function getLabels(labels: string[]): string[] {
 	let result: string[] = [];
 	labels.forEach(each => result.push('-l', each));