Skip to content

Changes for Features V2 #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrmarti merged 5 commits into from
Jul 6, 2022
Merged

Changes for Features V2 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce7902c
Changes for Features V2
edgonmsft Jul 1, 2022
ba7b6e1
eslint
chrmarti Jul 4, 2022
7475bec
Cleanup
chrmarti Jul 5, 2022
9938f2d
Use qualified name
chrmarti Jul 5, 2022
33acc6d
Copy from local features folder
chrmarti Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ tsconfig*.json
src
tsfmt.json
scripts/gitAskPass.sh
*.js.map
build
azure-pipelines.yml
.vscode
Expand Down
40 changes: 40 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
// 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",
},
{
"type": "node",
"request": "launch",
"name": "Launch Tests",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"cwd": "${workspaceFolder}",
"args": [
"-r",
"ts-node/register",
"--exit",
"src/test/*.test.ts"
],
"env": {
"TS_NODE_PROJECT": "src/test/tsconfig.json"
},
"console": "integratedTerminal",
}
]
}
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions src/spec-configuration/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -55,6 +60,7 @@ export interface DevContainerFromImageConfig {
updateRemoteUserUID?: boolean;
userEnvProbe?: UserEnvProbe;
features?: Record<string, string | boolean | Record<string, string | boolean>>;
overrideFeatureInstallOrder?: string[];
hostRequirements?: HostRequirements;
}

Expand Down Expand Up @@ -86,6 +92,7 @@ export type DevContainerFromDockerfileConfig = {
updateRemoteUserUID?: boolean;
userEnvProbe?: UserEnvProbe;
features?: Record<string, string | boolean | Record<string, string | boolean>>;
overrideFeatureInstallOrder?: string[];
hostRequirements?: HostRequirements;
} & (
{
Expand Down Expand Up @@ -133,6 +140,7 @@ export interface DevContainerFromDockerComposeConfig {
updateRemoteUserUID?: boolean;
userEnvProbe?: UserEnvProbe;
features?: Record<string, string | boolean | Record<string, string | boolean>>;
overrideFeatureInstallOrder?: string[];
hostRequirements?: HostRequirements;
}

Expand Down
Loading