Skip to content

Commit 2e0e691

Browse files
authored
Merge pull request #1831 from cachix/fix-devcontainer
devcontainer: update image url
2 parents 5499b20 + c0a1fd5 commit 2e0e691

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
]
77
}
88
},
9-
"image": "ghcr.io/cachix/devenv:latest",
9+
"image": "ghcr.io/cachix/devenv/devcontainer:latest",
1010
"overrideCommand": false,
1111
"updateContentCommand": "devenv test"
1212
}

docs/reference/options.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,7 +1670,7 @@ JSON value
16701670

16711671

16721672

1673-
List of preinstalled VSCode extensions.
1673+
A list of pre-installed VS Code extensions.
16741674

16751675

16761676

@@ -1706,7 +1706,7 @@ string
17061706

17071707

17081708
*Default:*
1709-
` "ghcr.io/cachix/devenv:latest" `
1709+
` "ghcr.io/cachix/devenv/devcontainer:latest" `
17101710

17111711
*Declared by:*
17121712
- [https://github.com/cachix/devenv/blob/main/src/modules/integrations/devcontainer.nix](https://github.com/cachix/devenv/blob/main/src/modules/integrations/devcontainer.nix)
@@ -1738,7 +1738,7 @@ anything
17381738

17391739

17401740

1741-
Command to run after container creation.
1741+
A command to run after the container is created.
17421742

17431743

17441744

src/modules/integrations/devcontainer.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ in
1515

1616
options.image = lib.mkOption {
1717
type = lib.types.str;
18-
default = "ghcr.io/cachix/devenv:latest";
18+
default = "ghcr.io/cachix/devenv/devcontainer:latest";
1919
description = ''
2020
The name of an image in a container registry.
2121
'';
@@ -33,15 +33,15 @@ in
3333
type = lib.types.anything;
3434
default = "devenv test";
3535
description = ''
36-
Command to run after container creation.
36+
A command to run after the container is created.
3737
'';
3838
};
3939

4040
options.customizations.vscode.extensions = lib.mkOption {
4141
type = lib.types.listOf lib.types.str;
4242
default = [ "mkhl.direnv" ];
4343
description = ''
44-
List of preinstalled VSCode extensions.
44+
A list of pre-installed VS Code extensions.
4545
'';
4646
};
4747
};

0 commit comments

Comments
 (0)