Skip to content

Commit f58f7ae

Browse files
committed
Upgrade devcontainer to Ubuntu 26.04
Now that the image is available at mcr.microsoft.com/devcontainers/base, switch from the deprecated vscode/devcontainers/base path and resolve the TODO that was tracking this.
1 parent 6652c8f commit f58f7ae

2 files changed

Lines changed: 6 additions & 12 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/ubuntu/.devcontainer/base.Dockerfile
2-
3-
# [Choice] Ubuntu version (use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon): ubuntu-22.04, ubuntu-20.04, ubuntu-18.04
4-
ARG VARIANT="jammy"
5-
FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
1+
# [Choice] Ubuntu version: ubuntu26.04, ubuntu24.04, ubuntu22.04
2+
ARG VARIANT="ubuntu26.04"
3+
FROM mcr.microsoft.com/devcontainers/base:${VARIANT}
64

75
# [Optional] Uncomment this section to install additional OS packages.
86
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

.devcontainer/devcontainer.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2-
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/ubuntu
3-
// TODO: Upgrade to ubuntu-26.04 once available in mcr.microsoft.com/vscode/devcontainers/base
4-
// See: https://github.com/devcontainers/images/issues/1858
5-
// Check availability with: curl -s -o /dev/null -w "%{http_code}" https://mcr.microsoft.com/v2/vscode/devcontainers/base/manifests/0-ubuntu-26.04
2+
// https://github.com/devcontainers/images/tree/main/src/base-ubuntu
63
{
74
"name": "Ubuntu",
85
"build": {
96
"dockerfile": "Dockerfile",
10-
// Update 'VARIANT' to pick an Ubuntu version: jammy / ubuntu-22.04, focal / ubuntu-20.04, bionic /ubuntu-18.04
11-
// Use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon.
7+
// Update 'VARIANT' to pick an Ubuntu version: ubuntu26.04, ubuntu24.04, ubuntu22.04
128
"args": {
13-
"VARIANT": "ubuntu-22.04"
9+
"VARIANT": "ubuntu26.04"
1410
}
1511
},
1612
// Use 'forwardPorts' to make a list of ports inside the container available locally.

0 commit comments

Comments
 (0)