Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/base:noble",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/docker-in-docker:3": {},
"ghcr.io/pablozaiden/devcontainers-features/bun": {}
},
"remoteEnv": {
Expand Down
4 changes: 2 additions & 2 deletions examples/complex-workspace/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"image": "mcr.microsoft.com/devcontainers/base:noble",
"features": {
"ghcr.io/devcontainers/features/azure-cli:1": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/docker-in-docker:3": {},
"ghcr.io/devcontainers/features/node:1": {},
"ghcr.io/devcontainers/features/terraform:1": {}
}
}
}
4 changes: 2 additions & 2 deletions examples/smoke-workspace/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "devbox-smoke-workspace",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "mcr.microsoft.com/devcontainers/base:noble",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
"ghcr.io/devcontainers/features/docker-in-docker:3": {}
}
}
2 changes: 1 addition & 1 deletion src/templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export interface DevboxTemplateSummary {

const BASE_IMAGE = "mcr.microsoft.com/devcontainers/base:noble";
const BASE_NAME = "noble";
const DOCKER_IN_DOCKER_FEATURE = "ghcr.io/devcontainers/features/docker-in-docker:2";
const DOCKER_IN_DOCKER_FEATURE = "ghcr.io/devcontainers/features/docker-in-docker:3";
const DOTNET_FEATURE = "ghcr.io/devcontainers/features/dotnet:2";
const GO_FEATURE = "ghcr.io/devcontainers/features/go:1";
const JAVA_FEATURE = "ghcr.io/devcontainers/features/java:1";
Expand Down
2 changes: 1 addition & 1 deletion tests/core.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ describe("resolveWorkspaceConfig", () => {
expect(rebuildStyleResolution.config).toEqual({
image: "mcr.microsoft.com/devcontainers/base:noble",
features: {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/docker-in-docker:3": {},
"ghcr.io/devcontainers-extra/features/uv:1": {},
},
});
Expand Down
10 changes: 5 additions & 5 deletions tests/examples.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -386,9 +386,9 @@ describe("example workspaces (simulated host tools)", () => {
expect(await readFile(String(fixture.sourceConfigPath), "utf8")).toBe(sourceBefore);

const generatedConfig = await readJson(fixture.generatedConfigPath);
expect(generatedConfig.image).toBe("mcr.microsoft.com/devcontainers/base:ubuntu");
expect(generatedConfig.image).toBe("mcr.microsoft.com/devcontainers/base:noble");
expect(generatedConfig.features).toEqual({
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/docker-in-docker:3": {},
});
expect(generatedConfig.runArgs).toEqual(["--name", "devbox-smoke-workspace-5001", "-p", "5001:5001"]);
expect(generatedConfig.mounts).toEqual([]);
Expand Down Expand Up @@ -485,7 +485,7 @@ describe("example workspaces (simulated host tools)", () => {
const generatedConfig = await readJson(fixture.generatedConfigPath);
expect(generatedConfig.features).toEqual({
"ghcr.io/devcontainers/features/azure-cli:1": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/docker-in-docker:3": {},
"ghcr.io/devcontainers/features/node:1": {},
"ghcr.io/devcontainers/features/terraform:1": {},
});
Expand Down Expand Up @@ -544,7 +544,7 @@ describe("example workspaces (simulated host tools)", () => {
const generatedConfig = await readJson(fixture.generatedConfigPath);
expect(generatedConfig.image).toBe("mcr.microsoft.com/devcontainers/base:noble");
expect(generatedConfig.features).toEqual({
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/docker-in-docker:3": {},
});
expect(generatedConfig.postCreateCommand).toBeUndefined();

Expand All @@ -554,7 +554,7 @@ describe("example workspaces (simulated host tools)", () => {
expect(state.template.name).toBe("ubuntu");
expect(state.template.image).toBe("mcr.microsoft.com/devcontainers/base:noble");
expect(state.template.pinnedReference).toBe(
"mcr.microsoft.com/devcontainers/base:noble + ghcr.io/devcontainers/features/docker-in-docker:2",
"mcr.microsoft.com/devcontainers/base:noble + ghcr.io/devcontainers/features/docker-in-docker:3",
);
expect(state.template.runtimeVersion).toBe("Ubuntu noble");

Expand Down
8 changes: 4 additions & 4 deletions tests/templates.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe("built-in templates", () => {
expect.objectContaining({
image: "mcr.microsoft.com/devcontainers/base:noble",
features: expect.objectContaining({
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/docker-in-docker:3": {},
}),
}),
);
Expand All @@ -29,13 +29,13 @@ describe("built-in templates", () => {
expect(template.base).toBe("noble");
expect(template.image).toBe("mcr.microsoft.com/devcontainers/base:noble");
expect(template.pinnedReference).toBe(
"mcr.microsoft.com/devcontainers/base:noble + ghcr.io/devcontainers/features/docker-in-docker:2 + ghcr.io/devcontainers/features/node:1 + ghcr.io/devcontainers-extra/features/bun:1",
"mcr.microsoft.com/devcontainers/base:noble + ghcr.io/devcontainers/features/docker-in-docker:3 + ghcr.io/devcontainers/features/node:1 + ghcr.io/devcontainers-extra/features/bun:1",
);
expect(template.runnerCompatible).toBe(true);
expect(template.config).toEqual({
image: "mcr.microsoft.com/devcontainers/base:noble",
features: {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/docker-in-docker:3": {},
"ghcr.io/devcontainers/features/node:1": {},
"ghcr.io/devcontainers-extra/features/bun:1": {},
},
Expand All @@ -51,7 +51,7 @@ describe("built-in templates", () => {
base: "noble",
image: "mcr.microsoft.com/devcontainers/base:noble",
pinnedReference:
"mcr.microsoft.com/devcontainers/base:noble + ghcr.io/devcontainers/features/docker-in-docker:2 + ghcr.io/devcontainers/features/node:1 + ghcr.io/devcontainers-extra/features/bun:1",
"mcr.microsoft.com/devcontainers/base:noble + ghcr.io/devcontainers/features/docker-in-docker:3 + ghcr.io/devcontainers/features/node:1 + ghcr.io/devcontainers-extra/features/bun:1",
runtimeVersion: "Node.js + Bun",
languages: ["node", "bun", "typescript", "javascript"],
runnerCompatible: true,
Expand Down
Loading