Skip to content

chore: Add Debian Trixie targets across archs and release variable #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

chore: Add Debian Trixie targets across archs and release variable #1036

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0f7b49
Add Debian Trixie targets across archs and release variable
gounthar Aug 19, 2025
2702f3c
fix: switch to trixie instead of keeping two debian flavours.
gounthar Aug 20, 2025
ac7d481
chore: remove comma
gounthar Aug 20, 2025
10aa561
Merge branch 'master' into trixie
gounthar Sep 2, 2025
ac9c60b
Merge branch 'master' into trixie
gounthar Sep 15, 2025
a2ebc4e
Merge branch 'master' into trixie
gounthar Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ group "linux" {
targets = [
"alpine",
"debian",
"debian_trixie",
Copy link
Member

@timja timja Aug 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we want to maintain two debian lines? or just maintain one?

Given additional build times and infra cost?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a great question. 🤔 Unfortunately, I'm not the right person to answer it. If it were up to me, I'd opt for one release with both Debian flavors, and then continue with only Trixie if no issues arise.

Copy link
Contributor

@MarkEWaite MarkEWaite Aug 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that we want only one Debian flavor and I think it should be based on Trixie.

I think that we should write a blog post and announce that we're switching the default container images from Debian Bookworm to Debian Trixie. We'll need to switch the container images for:

  • Jenkins core
  • Inbound agents
  • SSH agents

That aligns with our pattern of only supporting 1 operating system version for each operating system variant. The examples are:

  • Alpine - 3.22
  • Debian - 12 (Bookworm)
  • UBI - 9

I'm open to other opinions, but I think a transition from Bookworm to Trixie is the same type of transition that we did on the last Debian release when we transitioned from Bullseye to Bookworm:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your insights, everyone. 🙏

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for just switching tags to trixie

I've open the PR for the core : jenkinsci/docker#2063

"rhel_ubi9"
]
}
Expand All @@ -17,25 +18,29 @@ group "linux-arm64" {
targets = [
"alpine_jdk21",
"debian",
"debian_trixie",
"rhel_ubi9"
]
}

group "linux-arm32" {
targets = [
"debian_jdk17"
"debian_jdk17",
"debian_trixie_jdk17"
]
}

group "linux-s390x" {
targets = [
"debian_jdk21"
"debian_jdk21",
"debian_trixie_jdk21"
]
}

group "linux-ppc64le" {
targets = [
"debian",
"debian_trixie",
"rhel_ubi9"
]
}
Expand Down Expand Up @@ -104,6 +109,10 @@ variable "DEBIAN_RELEASE" {
default = "bookworm-20250811"
}

variable "DEBIAN_TRIXIE_RELEASE" {
default = "trixie-20250811"
}

variable "UBI9_TAG" {
default = "9.6-1754586119"
}
Expand Down Expand Up @@ -301,6 +310,24 @@ target "debian" {
platforms = debian_platforms(jdk)
}

target "debian_trixie" {
matrix = {
type = agent_types_to_build
jdk = jdks_to_build
}
name = "${type}_debian_trixie_jdk${jdk}"
target = type
dockerfile = "debian/Dockerfile"
context = "."
args = {
VERSION = REMOTING_VERSION
DEBIAN_RELEASE = DEBIAN_TRIXIE_RELEASE
JAVA_VERSION = "${javaversion(jdk)}"
}
tags = linux_tags(type, jdk, "trixie")
platforms = debian_platforms(jdk)
}

target "rhel_ubi9" {
matrix = {
type = agent_types_to_build
Expand Down