Upgrade to Ubuntu 26.04

Upgrades from Ubuntu 24.04 (noble) to Ubuntu 26.04 (resolute)

Author: yeikel

.devcontainer/devcontainer.json

@@ -1,5 +1,8 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/ubuntu
+// TODO: Upgrade to ubuntu-26.04 once available in mcr.microsoft.com/vscode/devcontainers/base
+// See: https://github.com/devcontainers/images/issues/1858
+// Check availability with: curl -s -o /dev/null -w "%{http_code}" https://mcr.microsoft.com/v2/vscode/devcontainers/base/manifests/0-ubuntu-26.04
 {
   "name": "Ubuntu",
   "build": {

Dockerfile.updater-core

@@ -1,5 +1,5 @@
 # syntax=docker.io/docker/dockerfile:1.20
-FROM docker.io/library/ubuntu:24.04
+FROM docker.io/library/ubuntu:26.04
 
 ARG TARGETARCH
 
@@ -61,25 +61,8 @@ EOF
 RUN apt-get update \
   && apt-get upgrade -y \
   && apt-get install -y --no-install-recommends \
-    # needed to run add-apt-repository
-    software-properties-common \
-    # Used to download the git-lfs GPG key as well as dev dependencies for CI
+    # Used for dev dependencies for CI
     curl \
-    # Add git core ppa to get a more recent git version than the one provided by ubuntu
-    && add-apt-repository -y ppa:git-core/ppa \
-    # Install the git-lfs mirror. See https://github.com/git-lfs/git-lfs/blob/main/INSTALLING.md
-    # We need this because the version of git-lfs provided by Ubuntu is outdated
-    # apt-transport-https is a temporary dependency to install the git-lfs apt source
-    && apt-get install -y --no-install-recommends apt-transport-https \
-    && mkdir -p /etc/apt/keyrings \
-           && curl -fsSL 'https://packagecloud.io/github/git-lfs/gpgkey' | gpg --dearmor > /etc/apt/keyrings/github_git-lfs-archive-keyring.gpg \
-           && release=$( . /etc/os-release && echo "$VERSION_CODENAME" ) \
-           && echo "deb [signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/ubuntu/ $release main" \
-              > /etc/apt/sources.list.d/github_git-lfs.list \
-           && echo "deb-src [signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/ubuntu/ $release main" \
-              >> /etc/apt/sources.list.d/github_git-lfs.list \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends \
     # dev dependencies for CI
     build-essential \
     libgmp-dev \
@@ -104,8 +87,6 @@ RUN apt-get update \
     libyaml-dev \
     locales \
   && locale-gen en_US.UTF-8 \
-  # No longer needed post git-core ppa addition and git-lfs install
-  && apt purge software-properties-common apt-transport-https -y && apt-get autoremove -y \
   && rm -rf /var/lib/apt/lists/*
 
 ARG USER_UID=1000

bun/Dockerfile

@@ -5,7 +5,7 @@ FROM ghcr.io/dependabot/dependabot-updater-core
 ARG BUN_VERSION=1.3.5
 
 # See https://github.com/nodesource/distributions#installation-instructions
-ARG NODEJS_VERSION=20
+ARG NODEJS_VERSION=24
 
 # Install Node and bun
 RUN mkdir -p /etc/apt/keyrings \

composer/Dockerfile

@@ -3,6 +3,11 @@ FROM ghcr.io/dependabot/dependabot-updater-core
 ARG COMPOSER_V2_VERSION=2.9.5
 ARG PHP_VERSION=8.4
 ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# NOTE: ondrej/php PPA does not yet support Ubuntu 26.04 (resolute).
+# Fall back to noble (24.04) packages until PPA support is available.
+# Track progress at: https://codeberg.org/oerdnj/deb.sury.org/issues/91
+
 RUN <<EOF
   apt-get update
   apt-get upgrade -y
@@ -11,6 +16,17 @@ RUN <<EOF
   # Install PHP and its packages
   add-apt-repository ppa:ondrej/php
   apt-get update
+
+  # Check if PHP is available for current release, fall back to noble if not
+  if ! apt-cache show php${PHP_VERSION} > /dev/null 2>&1; then
+    # Remove ondrej/php PPA and add it again with noble codename
+    add-apt-repository --remove ppa:ondrej/php -y
+    echo "deb http://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ondrej-ubuntu-php-noble.list
+    echo "deb-src http://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" >> /etc/apt/sources.list.d/ondrej-ubuntu-php-noble.list
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 14AA40EC0831756756D7F66C4F4EA0AAE5267A6C
+    apt-get update
+  fi
+  apt-get update
   apt-get install -y --no-install-recommends \
     php${PHP_VERSION} \
     php${PHP_VERSION}-apcu \

swift/Dockerfile

@@ -5,6 +5,10 @@ ARG TARGETARCH
 ENV PATH="${PATH}:/opt/swift/usr/bin"
 
 # OS dependencies
+# NOTE: Remove i386 multiarch support to prevent apt from trying to install i386 variants
+# that are unavailable in Ubuntu 26.04 (e.g., libxml2:i386). This doesn't impact arm64 builds.
+RUN dpkg --remove-architecture i386 2>/dev/null || true
+
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
     binutils \
@@ -29,6 +33,9 @@ USER dependabot
 # https://github.com/apple/swift-org-website/blob/main/_data/builds/swift_releases.yml
 ARG SWIFT_VERSION=6.2.3
 ARG SWIFT_UBUNTU_VERSION=ubuntu24.04
+# NOTE: Pinned to Ubuntu 24.04 because Swift builds are not yet available for Ubuntu 26.04.
+# See: https://github.com/swiftlang/swift/issues/88994
+# To check if builds are available: curl -L -o /dev/null -w "%{http_code}" https://download.swift.org/swift-6.2.3-release/ubuntu2604/swift-6.2.3-RELEASE/swift-6.2.3-RELEASE-ubuntu26.04.tar.gz
 
 RUN if [ "$TARGETARCH" = "arm64" ]; then SWIFT_UBUNTU_VERSION="${SWIFT_UBUNTU_VERSION}-aarch64"; fi \
   && SWIFT_SHORT_UBUNTU_VERSION=$(echo $SWIFT_UBUNTU_VERSION | tr -d .) \