support Ubuntu 26.04 (resolute) (#1848)

* support Ubuntu 26.04 (resolute)

* support Ubuntu 26.04 (resolute)

* Update Dockerfile to handle 'resolute' variant in user deletion logic

* Enhance user deletion logic and add support for 'resolute' variant in user checks

* Enhance user deletion logic and add support for 'resolute' variant in user checks

* Fix user deletion message in Dockerfile

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fix formatting in manifest.json tags section

---------

Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 3 people

src/base-ubuntu/.devcontainer/Dockerfile

@@ -1,15 +1,15 @@
-ARG VARIANT="noble"
+ARG VARIANT="resolute"
 FROM buildpack-deps:${VARIANT}-curl
 
 LABEL dev.containers.features="common"
 
 ARG VARIANT
-RUN if [ "$VARIANT" = "noble" ]; then \
-        if id "ubuntu" &>/dev/null; then \
-            echo "Deleting user 'ubuntu'  for $VARIANT" && userdel -f -r ubuntu || echo "Failed to delete ubuntu user for $VARIANT"; \  
-        else \
-            echo "User 'ubuntu' does not exist for $VARIANT"; \ 
-        fi; \
+RUN if [ "$VARIANT" = "noble" ] || [ "$VARIANT" = "resolute" ]; then \
+    if id "ubuntu" &>/dev/null; then \
+        echo "Deleting user 'ubuntu'  for $VARIANT" && userdel -f -r ubuntu || echo "Failed to delete ubuntu user for $VARIANT"; \
+    else \
+         echo "User 'ubuntu' does not exist for $VARIANT"; \
+    fi; \
     fi
 
 # [Optional] Uncomment this section to install additional OS packages.
@@ -20,4 +20,5 @@ RUN if [ "$VARIANT" = "noble" ]; then \
 RUN apt-get update \
     && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y reinstall --no-install-recommends tzdata \
-    && rm -rf /var/lib/apt/lists/*
+    && echo "Etc/UTC" > /etc/timezone \
+    && rm -rf /var/lib/apt/lists/*

src/base-ubuntu/README.md

@@ -9,8 +9,8 @@
 | *Categories* | Core, Other |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/base:ubuntu |
-| *Available image variants* | ubuntu24.04 / noble, ubuntu22.04 / jammy ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
-| *Published image architecture(s)* | x86-64, aarch64/arm64 for `ubuntu22.04` (`jammy`) and `ubuntu24.04` (`noble`) variants |
+| *Available image variants* | ubuntu26.04 / resolute, ubuntu24.04 / noble, ubuntu22.04 / jammy ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
+| *Published image architecture(s)* | x86-64, aarch64/arm64 for `ubuntu26.04` (`resolute`) and `ubuntu24.04` (`noble`) and `ubuntu22.04` (`jammy`) variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Ubuntu |
 | *Languages, platforms* | Any |
@@ -22,16 +22,17 @@ See **[history](history)** for information on the contents of published images.
 You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
 
 - `mcr.microsoft.com/devcontainers/base:ubuntu` (latest LTS release)
+- `mcr.microsoft.com/devcontainers/base:ubuntu26.04` (or `resolute`)
 - `mcr.microsoft.com/devcontainers/base:ubuntu24.04` (or `noble`)
 - `mcr.microsoft.com/devcontainers/base:ubuntu22.04` (or `jammy`)
 
 Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 
-- `mcr.microsoft.com/devcontainers/base:2-jammy`
-- `mcr.microsoft.com/devcontainers/base:2.1-jammy`
-- `mcr.microsoft.com/devcontainers/base:2.1.8-jammy`
+- `mcr.microsoft.com/devcontainers/base:3-jammy`
+- `mcr.microsoft.com/devcontainers/base:3.0-jammy`
+- `mcr.microsoft.com/devcontainers/base:3.0.0-jammy`
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/base/tags/list).
 

src/base-ubuntu/manifest.json

@@ -1,13 +1,18 @@
 {
-	"version": "2.1.8",
+	"version": "3.0.0",
 	"variants": [
+		"resolute",
 		"noble",
 		"jammy"
 	],
 	"build": {
 		"latest": false,
 		"rootDistro": "debian",
 		"architectures": {
+			"resolute": [
+				"linux/amd64",
+				"linux/arm64"
+			],
 			"noble": [
 				"linux/amd64",
 				"linux/arm64"
@@ -21,10 +26,13 @@
 			"base:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
-			"noble": [
-				"base:${VERSION}-ubuntu24.04",
+			"resolute": [
+				"base:${VERSION}-ubuntu26.04",
 				"base:${VERSION}-ubuntu"
 			],
+			"noble": [
+				"base:${VERSION}-ubuntu24.04"
+			],
 			"jammy": [
 				"base:${VERSION}-ubuntu22.04"
 			]
@@ -40,4 +48,4 @@
 			"git": {}
 		}
 	}
-}
+}

src/base-ubuntu/test-project/test.sh

@@ -32,8 +32,11 @@ check_ubuntu_user() {
 if grep -q 'VERSION_CODENAME=noble' /etc/os-release; then
     echo -e "\nThe base image is ubuntu:noble. Checking user Ubuntu.."
     check "uid" "check_ubuntu_user"
+elif grep -q 'VERSION_CODENAME=resolute' /etc/os-release; then
+    echo -e "\nThe base image is ubuntu:resolute. Checking user Ubuntu.."
+    check "uid" "check_ubuntu_user"
 else
-    echo -e "\nCannot check user Ubuntu. The base image is not ubuntu:noble."
+    echo -e "\nCannot check user Ubuntu. The base image is not ubuntu:noble or ubuntu:resolute."
 fi
 
 # Report result