Merge pull request #6 from devcontainers/edgon/features-1

Changes for Features V2

Author: edgonmsft

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch cli - up",
+            "program": "${workspaceFolder}/src/spec-node/devContainersSpecCLI.ts",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "up",
+                "--workspace-folder",
+                "../devcontainers-features",
+                "--log-level",
+                "debug",
+            ],
+            "console": "integratedTerminal",
+        }
+    ]
+}

package.json

@@ -41,6 +41,7 @@
 		"@types/js-yaml": "^4.0.5",
 		"@types/mocha": "^9.1.0",
 		"@types/node": "^16.11.7",
+		"@types/ncp": "^2.0.5",
 		"@types/pull-stream": "^3.6.2",
 		"@types/semver": "^7.3.9",
 		"@types/shell-quote": "^1.7.1",
@@ -65,6 +66,7 @@
 		"vinyl-fs": "^3.0.3"
 	},
 	"dependencies": {
+		"ncp": "^2.0.0",
 		"follow-redirects": "^1.14.8",
 		"js-yaml": "^4.1.0",
 		"jsonc-parser": "^3.0.0",

src/spec-configuration/configuration.ts

@@ -26,6 +26,11 @@ export interface HostRequirements {
 	storage?: string;
 }
 
+export interface DevContainerFeature {
+	id: string;
+	options: boolean | string | Record<string, boolean | string | undefined>;
+}
+
 export interface DevContainerFromImageConfig {
 	configFilePath: URI;
 	image: string;
@@ -55,6 +60,7 @@ export interface DevContainerFromImageConfig {
 	updateRemoteUserUID?: boolean;
 	userEnvProbe?: UserEnvProbe;
 	features?: Record<string, string | boolean | Record<string, string | boolean>>;
+	overrideFeatureInstallOrder?: string[];
 	hostRequirements?: HostRequirements;
 }
 
@@ -86,6 +92,7 @@ export type DevContainerFromDockerfileConfig = {
 	updateRemoteUserUID?: boolean;
 	userEnvProbe?: UserEnvProbe;
 	features?: Record<string, string | boolean | Record<string, string | boolean>>;
+	overrideFeatureInstallOrder?: string[];
 	hostRequirements?: HostRequirements;
 } & (
 		{
@@ -133,6 +140,7 @@ export interface DevContainerFromDockerComposeConfig {
 	updateRemoteUserUID?: boolean;
 	userEnvProbe?: UserEnvProbe;
 	features?: Record<string, string | boolean | Record<string, string | boolean>>;
+	overrideFeatureInstallOrder?: string[];
 	hostRequirements?: HostRequirements;
 }