merge

Author: joshspicer

.github/workflows/test-plan-item-validator.yml

@@ -0,0 +1,25 @@
+name: Test Plan Item Validator
+on:
+  issues:
+    types: [edited]
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
+        uses: actions/checkout@v2
+        with:
+          repository: 'microsoft/vscode-github-triage-actions'
+          ref: stable
+      - name: Install Actions
+        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
+        run: npm install --production
+      - name: Run Test Plan Item Validator
+        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
+        uses: ./test-plan-item-validator
+        with:
+          label: testplan-item
+          invalidLabel: invalid-testplan-item
+          comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.

.vscode/launch.json

@@ -10,7 +10,13 @@
             "name": "Launch cli - up",
             "program": "${workspaceFolder}/src/spec-node/devContainersSpecCLI.ts",
             "cwd": "${workspaceFolder}",
-            "args": ["up", "--workspace-folder", "../features-playground", "--log-level", "debug", ],
+            "args": [
+                "up",
+                "--workspace-folder",
+                "../devcontainers-features",
+                "--log-level",
+                "debug",
+            ],
             "console": "integratedTerminal",
         }
     ]

CHANGELOG.md

@@ -2,8 +2,30 @@
 
 Notable changes.
 
+## June 2022
+
+### [0.7.0]
+
+- Multi-platform build support. (https://github.com/devcontainers/cli/pull/24)
+- User-scoped tmp folder on Linux. (https://github.com/microsoft/vscode-remote-release/issues/2347)
+
 ## May 2022
 
+### [0.6.0]
+
+- Handle undefined context. (https://github.com/microsoft/vscode-remote-release/issues/6815)
+- Avoid comment after ARG for Podman. (https://github.com/microsoft/vscode-remote-release/issues/6819)
+- Update to vscode-dev-containers 0.238.1.
+
+### [0.5.0]
+
+- Update to vscode-dev-containers 0.238.0.
+
+### [0.4.0]
+
+- Merge user and features Dockerfile to simplify cache and multi-platform handling.
+- Use PTY for `--log-format-json`.
+
 ### [0.3.0]
 
 - BuildKit version check for `--build-context`.

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@devcontainers/cli",
 	"description": "Dev Containers CLI",
-	"version": "0.3.0",
+	"version": "0.7.0",
 	"bin": {
 		"devcontainer": "devcontainer.js"
 	},
@@ -78,7 +78,7 @@
 		"shell-quote": "^1.7.3",
 		"stream-to-pull-stream": "^1.7.3",
 		"tar": "^6.1.11",
-		"vscode-dev-containers": "https://github.com/microsoft/vscode-dev-containers/releases/download/v0.236.0/vscode-dev-containers-0.236.0.tgz",
+		"vscode-dev-containers": "https://github.com/microsoft/vscode-dev-containers/releases/download/v0.241.1/vscode-dev-containers-0.241.1.tgz",
 		"vscode-uri": "^3.0.3",
 		"yargs": "~17.0.1"
 	}

src/spec-common/cliHost.ts

@@ -35,6 +35,7 @@ export interface CLIHost {
 	mkdirp(dirpath: string): Promise<void>;
 	readDir(dirpath: string): Promise<string[]>;
 	readDirWithTypes?(dirpath: string): Promise<[string, FileTypeBitmask][]>;
+	getUsername(): Promise<string>;
 	getuid(): Promise<number>;
 	getgid(): Promise<number>;
 	toCommonURI(filePath: string): Promise<URI | undefined>;
@@ -78,6 +79,7 @@ function createLocalCLIHostFromExecFunctions(localCwd: string, exec: ExecFunctio
 			await mkdirpLocal(dirpath);
 		},
 		readDir: readLocalDir,
+		getUsername: async () => os.userInfo().username,
 		getuid: async () => process.getuid(),
 		getgid: async () => process.getgid(),
 		toCommonURI: async (filePath) => URI.file(filePath),

src/spec-common/injectHeadless.ts

@@ -56,6 +56,8 @@ export interface ResolverParameters {
 	backgroundTasks: (Promise<void> | (() => Promise<void>))[];
 	persistedFolder: string; // A path where config can be persisted and restored at a later time. Should default to tmpdir() folder if not provided.
 	remoteEnv: Record<string, string>;
+	buildxPlatform: string | undefined;
+	buildxPush: boolean;
 }
 
 export interface PostCreate {
@@ -105,18 +107,13 @@ export type DevContainerConfigCommand = 'initializeCommand' | 'onCreateCommand'
 
 const defaultWaitFor: DevContainerConfigCommand = 'updateContentCommand';
 
-export interface DevContainerFeature {
-	id: string;
-	options: boolean | string | Record<string, boolean | string | undefined>;
-}
-
 export interface CommonDevContainerConfig {
 	configFilePath?: URI;
 	remoteEnv?: Record<string, string | null>;
 	forwardPorts?: (number | string)[];
 	portsAttributes?: Record<string, PortAttributes>;
 	otherPortsAttributes?: PortAttributes;
-	features?: DevContainerFeature[] | Record<string, string | boolean | Record<string, string | boolean>>;
+	features?: Record<string, string | boolean | Record<string, string | boolean>>;
 	onCreateCommand?: string | string[];
 	updateContentCommand?: string | string[];
 	postCreateCommand?: string | string[];

src/spec-configuration/configuration.ts

@@ -59,7 +59,8 @@ export interface DevContainerFromImageConfig {
 	remoteUser?: string;
 	updateRemoteUserUID?: boolean;
 	userEnvProbe?: UserEnvProbe;
-	features?: DevContainerFeature[] | Record<string, string | boolean | Record<string, string | boolean>>;
+	features?: Record<string, string | boolean | Record<string, string | boolean>>;
+	overrideFeatureInstallOrder?: string[];
 	hostRequirements?: HostRequirements;
 }
 
@@ -90,7 +91,8 @@ export type DevContainerFromDockerfileConfig = {
 	remoteUser?: string;
 	updateRemoteUserUID?: boolean;
 	userEnvProbe?: UserEnvProbe;
-	features?: DevContainerFeature[] | Record<string, string | boolean | Record<string, string | boolean>>;
+	features?: Record<string, string | boolean | Record<string, string | boolean>>;
+	overrideFeatureInstallOrder?: string[];
 	hostRequirements?: HostRequirements;
 } & (
 		{
@@ -137,7 +139,8 @@ export interface DevContainerFromDockerComposeConfig {
 	remoteUser?: string;
 	updateRemoteUserUID?: boolean;
 	userEnvProbe?: UserEnvProbe;
-	features?: DevContainerFeature[] | Record<string, string | boolean | Record<string, string | boolean>>;
+	features?: Record<string, string | boolean | Record<string, string | boolean>>;
+	overrideFeatureInstallOrder?: string[];
 	hostRequirements?: HostRequirements;
 }
 
@@ -196,42 +199,40 @@ export function getDockerfile(config: DevContainerFromDockerfileConfig) {
 	return 'dockerFile' in config ? config.dockerFile : config.build.dockerfile;
 }
 
-export async function getDockerComposeFilePaths(cliHost: FileHost, config: DevContainerFromDockerComposeConfig, envForComposeFile?: NodeJS.ProcessEnv, cwdForDefaultFiles?: string) {
+export async function getDockerComposeFilePaths(cliHost: FileHost, config: DevContainerFromDockerComposeConfig, envForComposeFile: NodeJS.ProcessEnv, cwdForDefaultFiles: string) {
 	if (Array.isArray(config.dockerComposeFile)) {
 		if (config.dockerComposeFile.length) {
 			return config.dockerComposeFile.map(composeFile => uriToFsPath(getConfigFilePath(cliHost, config, composeFile), cliHost.platform));
 		}
 	} else if (typeof config.dockerComposeFile === 'string') {
 		return [uriToFsPath(getConfigFilePath(cliHost, config, config.dockerComposeFile), cliHost.platform)];
 	}
-	if (cwdForDefaultFiles) {
-		const envComposeFile = envForComposeFile?.COMPOSE_FILE;
-		if (envComposeFile) {
-			return envComposeFile.split(cliHost.path.delimiter)
+	
+	const envComposeFile = envForComposeFile?.COMPOSE_FILE;
+	if (envComposeFile) {
+		return envComposeFile.split(cliHost.path.delimiter)
+			.map(composeFile => cliHost.path.resolve(cwdForDefaultFiles, composeFile));
+	}
+
+	try {
+		const envPath = cliHost.path.join(cwdForDefaultFiles, '.env');
+		const buffer = await cliHost.readFile(envPath);
+		const match = /^COMPOSE_FILE=(.+)$/m.exec(buffer.toString());
+		const envFileComposeFile = match && match[1].trim();
+		if (envFileComposeFile) {
+			return envFileComposeFile.split(cliHost.path.delimiter)
 				.map(composeFile => cliHost.path.resolve(cwdForDefaultFiles, composeFile));
 		}
-
-		try {
-			const envPath = cliHost.path.join(cwdForDefaultFiles, '.env');
-			const buffer = await cliHost.readFile(envPath);
-			const match = /^COMPOSE_FILE=(.+)$/m.exec(buffer.toString());
-			const envFileComposeFile = match && match[1].trim();
-			if (envFileComposeFile) {
-				return envFileComposeFile.split(cliHost.path.delimiter)
-					.map(composeFile => cliHost.path.resolve(cwdForDefaultFiles, composeFile));
-			}
-		} catch (err) {
-			if (!(err && (err.code === 'ENOENT' || err.code === 'EISDIR'))) {
-				throw err;
-			}
+	} catch (err) {
+		if (!(err && (err.code === 'ENOENT' || err.code === 'EISDIR'))) {
+			throw err;
 		}
+	}
 
-		const defaultFiles = [cliHost.path.resolve(cwdForDefaultFiles, 'docker-compose.yml')];
-		const override = cliHost.path.resolve(cwdForDefaultFiles, 'docker-compose.override.yml');
-		if (await cliHost.isFile(override)) {
-			defaultFiles.push(override);
-		}
-		return defaultFiles;
+	const defaultFiles = [cliHost.path.resolve(cwdForDefaultFiles, 'docker-compose.yml')];
+	const override = cliHost.path.resolve(cwdForDefaultFiles, 'docker-compose.override.yml');
+	if (await cliHost.isFile(override)) {
+		defaultFiles.push(override);
 	}
-	return [];
+	return defaultFiles;
 }