From dc7ae3aab90ca6a89fc52245600cb24b6745ec58 Mon Sep 17 00:00:00 2001
From: giles knap <giles.knap@diamond.ac.uk>
Date: Sat, 2 May 2026 18:18:40 +0000
Subject: [PATCH] feat: track ubuntu 26.04 (resolute) on main

Bump base image to ubuntu:resolute-20260413 and publish images tagged
resolute, 26.04, and latest from this branch. The noble branch
continues to track 24.04.

Renovate is configured with baseBranches so each branch receives only
the updates that match its release line: resolute-* on main and
noble-* on noble.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .github/workflows/ci.yml |  3 ++-
 Dockerfile               |  2 +-
 renovate.json            | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 950b86b..28e581f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -115,7 +115,8 @@ jobs:
           tags: |
             type=ref,event=tag
             type=raw,value=latest
-            type=raw,value=noble
+            type=raw,value=resolute
+            type=raw,value=26.04
 
       - name: Log in to GitHub Docker Registry
         uses: docker/login-action@v4
diff --git a/Dockerfile b/Dockerfile
index 2b1eaa8..679b3f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # The devcontainer should use the developer target and run as root with podman
 # or docker with user namespaces.
-FROM ubuntu:noble-20260410
+FROM ubuntu:resolute-20260413
 
 # Add any system dependencies for the developer/build environment here
 RUN apt-get update && \
diff --git a/renovate.json b/renovate.json
index 5db72dd..6bf280e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,5 +2,21 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended"
+  ],
+  "baseBranches": [
+    "main",
+    "noble"
+  ],
+  "packageRules": [
+    {
+      "matchBaseBranches": ["main"],
+      "matchDepNames": ["ubuntu"],
+      "allowedVersions": "/^resolute(-.*)?$/"
+    },
+    {
+      "matchBaseBranches": ["noble"],
+      "matchDepNames": ["ubuntu"],
+      "allowedVersions": "/^noble(-.*)?$/"
+    }
   ]
 }