Skip to content

Commit 4cd749d

Browse files
committed
update comments
1 parent 3712c3d commit 4cd749d

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
Notable changes.
44

5+
## December 2025
6+
7+
### [0.81.0]
8+
- devcontainer commands now use current directory as default workspace folder when not specified (https://github.com/devcontainers/cli/pull/1104)
9+
510
## November 2025
611

712
### [0.80.2]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@devcontainers/cli",
33
"description": "Dev Containers CLI",
4-
"version": "0.80.3",
4+
"version": "0.81.0",
55
"bin": {
66
"devcontainer": "devcontainer.js"
77
},

src/spec-node/devContainersSpecCLI.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function provisionOptions(y: Argv) {
103103
'docker-compose-path': { type: 'string', description: 'Docker Compose CLI path.' },
104104
'container-data-folder': { type: 'string', description: 'Container data folder where user data inside the container will be stored.' },
105105
'container-system-data-folder': { type: 'string', description: 'Container system data folder where system data inside the container will be stored.' },
106-
'workspace-folder': { type: 'string', description: 'Workspace folder path. The devcontainer.json will be looked up relative to this path. If not provided, defaults to the current directory.' },
106+
'workspace-folder': { type: 'string', description: 'Workspace folder path. The devcontainer.json will be looked up relative to this path. If --id-label, --override-config, and --workspace-folder are not provided, this defaults to the current directory.' },
107107
'workspace-mount-consistency': { choices: ['consistent' as 'consistent', 'cached' as 'cached', 'delegated' as 'delegated'], default: 'cached' as 'cached', description: 'Workspace mount consistency.' },
108108
'gpu-availability': { choices: ['all' as 'all', 'detect' as 'detect', 'none' as 'none'], default: 'detect' as 'detect', description: 'Availability of GPUs in case the dev container requires any. `all` expects a GPU to be available.' },
109109
'mount-workspace-git-root': { type: 'boolean', default: true, description: 'Mount the workspace using its Git root.' },

src/spec-node/featuresCLI/resolveDependencies.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export function featuresResolveDependenciesOptions(y: Argv) {
3030
return y
3131
.options({
3232
'log-level': { choices: ['error' as 'error', 'info' as 'info', 'debug' as 'debug', 'trace' as 'trace'], default: 'error' as 'error', description: 'Log level.' },
33-
'workspace-folder': { type: 'string', description: 'Workspace folder to use for the configuration.' },
33+
'workspace-folder': { type: 'string', description: 'Workspace folder to use for the configuration.If --workspace-folder is not provided, this defaults to the current directory' },
3434
});
3535
}
3636

src/spec-node/templatesCLI/apply.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import path from 'path';
1111
export function templateApplyOptions(y: Argv) {
1212
return y
1313
.options({
14-
'workspace-folder': { type: 'string', alias: 'w', default: '.', description: 'Target workspace folder to apply Template' },
14+
'workspace-folder': { type: 'string', alias: 'w', description: 'Target workspace folder to apply Template. If --workspace-folder is not provided, this defaults to the current directory' },
1515
'template-id': { type: 'string', alias: 't', demandOption: true, description: 'Reference to a Template in a supported OCI registry' },
1616
'template-args': { type: 'string', alias: 'a', default: '{}', description: 'Arguments to replace within the provided Template, provided as JSON' },
1717
'features': { type: 'string', alias: 'f', default: '[]', description: 'Features to add to the provided Template, provided as JSON.' },

src/test/container-features/featuresCLICommands.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { assert } from 'chai';
22
import path from 'path';
3+
import { existsSync } from 'fs';
34
import { createPlainLog, LogLevel, makeLog } from '../../spec-utils/log';
45
import { isLocalFile, readLocalFile } from '../../spec-utils/pfs';
56
import { ExecResult, shellExec } from '../testUtils';
67
import { getSemanticTags } from '../../spec-node/collectionCommonUtils/publishCommandImpl';
78
import { getRef, getPublishedTags, getVersionsStrictSorted } from '../../spec-configuration/containerCollectionsOCI';
89
import { generateFeaturesDocumentation } from '../../spec-node/collectionCommonUtils/generateDocsCommandImpl';
10+
import pkg from '../../../package.json';
911
export const output = makeLog(createPlainLog(text => process.stdout.write(text), () => LogLevel.Trace));
1012

11-
const pkg = require('../../../package.json');
12-
1313
describe('CLI features subcommands', async function () {
1414
this.timeout('240s');
1515

@@ -441,8 +441,8 @@ describe('CLI features subcommands', async function () {
441441
const absoluteCliPath = `npx --prefix ${absoluteTmpPath} devcontainer`;
442442

443443
// First check if the config file exists
444-
const configExists = require('fs').existsSync('.devcontainer/devcontainer.json') ||
445-
require('fs').existsSync('.devcontainer.json');
444+
const configExists = existsSync('.devcontainer/devcontainer.json') ||
445+
existsSync('.devcontainer.json');
446446
assert.isTrue(configExists, 'Test config file should exist');
447447

448448
let result;

0 commit comments

Comments
 (0)