Skip to content

Add Ubuntu 26.04 support - #85

Merged
bschwedler merged 2 commits into
mainfrom
ubuntu-2604
Aug 14, 2026
Merged

Add Ubuntu 26.04 support#85
bschwedler merged 2 commits into
mainfrom
ubuntu-2604

Conversation

@bschwedler

@bschwedler bschwedler commented Apr 28, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Add Ubuntu 26.04 (resolute) to workbench dev versions, workbench-session-init dev versions, and workbench-session matrix
  • Create Containerfile.ubuntu2604.jinja2 and dep files for all three images

Dependencies

Requires posit-dev/images-shared#494 to be merged first.

Test plan

  • bakery build --plan generates correct matrix entries for Ubuntu 26.04
  • Dev build of workbench on Ubuntu 26.04 succeeds
  • Workbench-session matrix build includes Ubuntu 26.04

@bschwedler
bschwedler marked this pull request as draft April 28, 2026 20:23
@bschwedler
bschwedler force-pushed the ubuntu-2604 branch 2 times, most recently from d8b1806 to 6e64ae3 Compare April 28, 2026 20:31
@bschwedler

Copy link
Copy Markdown
Contributor Author

This requires pro-drivers to release for Ubuntu 26.04.

@bschwedler
bschwedler marked this pull request as ready for review July 9, 2026 15:28
@bschwedler

Copy link
Copy Markdown
Contributor Author

Waiting to merge for an official workbench release.

@bschwedler
bschwedler force-pushed the ubuntu-2604 branch 2 times, most recently from 869987a to 39752be Compare August 14, 2026 15:38
@bschwedler
bschwedler changed the base branch from main to chore/drop-legacy-rootless-support August 14, 2026 15:46
Adds Ubuntu 26.04 (resolute) as a new OS target for workbench,
workbench-session, and workbench-session-init, alongside the
existing 22.04 and 24.04 targets, for both amd64 and arm64
platforms. Templates mirror the Ubuntu 24.04 baseline exactly:
Containerfiles are byte-for-byte identical in structure once the OS
version and codename strings are normalized, and package lists
render to identical content.

- bakery.yaml: add Ubuntu 26.04 entries for workbench (2026.08.0
  and preview), workbench-session-init (preview), and the
  workbench-session matrix, each with amd64/arm64 platforms.
- Containerfile.ubuntu2604.jinja2 templates for all three images,
  based on the Ubuntu 24.04 templates with the base image, package
  file paths, and codename references (resolute, not noble) updated
  for 26.04, including the Standard/Minimal variant branching for
  workbench and workbench-session.
- ubuntu-26.04_packages.txt.jinja2 / ubuntu-26.04_optional_packages.txt.jinja2
  dependency lists for workbench and workbench-session, matching the
  24.04 package sets (including the default-libmysqlclient-dev vs
  libmysqlclient-dev distinction called out in the 24.04 comment, to
  avoid a build-breaking conflict with libgdal-dev).
- Rendered workbench/2026.08 and workbench-session matrix
  Containerfiles and dep files for Ubuntu 26.04.
"### Initialize PTI in container ###" dates back to an early
workbench-session-init design that shelled out to a standalone PTI
binary (see the removed PTI_VERSION/PTI_NO_COLOR ARGs and the
FIXME about PTI not yet being public). That approach was replaced
by the current apt.run_setup() + rsp-session-multi-linux download,
but the comment above apt.run_setup() was never updated to match.

Rename it to "Setup environment", matching the label workbench's
own Containerfile uses for the identical apt.run_setup() call.
Applied to the template and to every already-rendered version that
still carries the stale comment (2025.09 through 2026.08).
@bschwedler

Copy link
Copy Markdown
Contributor Author

The rstudio-server package does not yet exist in the ubuntu/resolute debian repo.

@skyeturriff

Copy link
Copy Markdown
Contributor

The rstudio-server package does not yet exist in the ubuntu/resolute debian repo.

@bschwedler apologies, working on it now!

Base automatically changed from chore/drop-legacy-rootless-support to main August 14, 2026 19:37
@bschwedler
bschwedler merged commit 3b5d8ca into main Aug 14, 2026
112 of 130 checks passed
@bschwedler
bschwedler deleted the ubuntu-2604 branch August 14, 2026 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants