feat: add Debian Trixie (13) target (#867)

bketelsen · Stevenjin8 · commit d1f168ff7d8b · 2025-11-25T20:10:40.000-05:00
* feat: add Debian Trixie (13) target

Adds Debian Trixie as a build target, updates tests, docs, and CI.

Signed-off-by: Brian Ketelsen &lt;bketelsen@gmail.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -100,10 +100,11 @@ jobs:
           - Almalinux9
           - Rockylinux8
           - Rockylinux9
+          - Trixie
           - other
         include:
           - suite: other
-            skip: Mariner2|Azlinux3|Bookworm|Bullseye|Bionic|Focal|Jammy|Noble|Windows|Almalinux8|Almalinux9|Rockylinux8|Rockylinux9
+            skip: Mariner2|Azlinux3|Bookworm|Bullseye|Bionic|Focal|Jammy|Noble|Windows|Almalinux8|Almalinux9|Rockylinux8|Rockylinux9|Trixie
 
     # TODO: support diff/merge
     # Right now this is handled by the e2e suite, but we can migrate that here.
diff --git a/.github/workflows/worker-images/matrix.json b/.github/workflows/worker-images/matrix.json
@@ -1 +1 @@
-{"include":[{"target":"bookworm/worker"},{"target":"bullseye/worker"},{"target":"bionic/worker"},{"target":"focal/worker"},{"target":"jammy/worker"},{"target":"noble/worker"},{"target":"almalinux8/worker"},{"target":"almalinux9/worker"},{"target":"rockylinux8/worker"},{"target":"rockylinux9/worker"},{"target":"mariner2/worker"},{"target":"azlinux3/worker"},{"target":"windowscross/worker"}]}
+{"include":[{"target":"trixie/worker"},{"target":"bookworm/worker"},{"target":"bullseye/worker"},{"target":"bionic/worker"},{"target":"focal/worker"},{"target":"jammy/worker"},{"target":"noble/worker"},{"target":"almalinux8/worker"},{"target":"almalinux9/worker"},{"target":"rockylinux8/worker"},{"target":"rockylinux9/worker"},{"target":"mariner2/worker"},{"target":"azlinux3/worker"},{"target":"windowscross/worker"}]}
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -66,7 +66,7 @@ target "maps-dep" {
         "dalec_frontend" = "target:frontend"
     }
     matrix = {
-        tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "bookworm/deb", "bullseye/deb"]
+        tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "trixie/deb", "bookworm/deb", "bullseye/deb"]
     }
     target = tgt
 }
@@ -81,7 +81,7 @@ target "maps-buildstep" {
         "dalec_frontend" = "target:frontend"
     }
     matrix = {
-        tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "bookworm/deb", "bullseye/deb"]
+        tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "trixie/deb", "bookworm/deb", "bullseye/deb"]
     }
     target = tgt
 }
@@ -96,7 +96,7 @@ target "maps-test" {
         "dalec_frontend" = "target:frontend"
     }
     matrix = {
-        tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "bookworm/deb", "bullseye/deb"]
+        tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "trixie/deb", "bookworm/deb", "bullseye/deb"]
     }
     target = tgt
 }
@@ -111,7 +111,7 @@ target "maps-source" {
         "dalec_frontend" = "target:frontend"
     }
     matrix = {
-        tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "bookworm/deb", "bullseye/deb"]
+        tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "trixie/deb", "bookworm/deb", "bullseye/deb"]
     }
     target = tgt
 }
diff --git a/targets/linux/deb/debian/common.go b/targets/linux/deb/debian/common.go
@@ -30,6 +30,7 @@ var (
 	}
 
 	targets = map[string]gwclient.BuildFunc{
+		TrixieDefaultTargetKey: TrixieConfig.Handle,
 		BookwormDefaultTargetKey: BookwormConfig.Handle,
 		BullseyeDefaultTargetKey: BullseyeConfig.Handle,
 	}
diff --git a/targets/linux/deb/debian/trixie.go b/targets/linux/deb/debian/trixie.go
@@ -0,0 +1,26 @@
+package debian
+
+import (
+	"github.com/project-dalec/dalec/targets/linux/deb/distro"
+)
+
+const (
+	TrixieDefaultTargetKey  = "trixie"
+	TrixieAptCachePrefix    = "trixie"
+	TrixieWorkerContextName = "dalec-trixie-worker"
+
+	trixieRef       = "docker.io/library/debian:trixie"
+	trixieVersionID = "debian13"
+)
+
+var (
+	TrixieConfig = &distro.Config{
+		ImageRef:           trixieRef,
+		AptCachePrefix:     TrixieAptCachePrefix,
+		VersionID:          trixieVersionID,
+		ContextRef:         TrixieWorkerContextName,
+		DefaultOutputImage: trixieRef,
+		BuilderPackages:    builderPackages,
+		BasePackages:       basePackages,
+	}
+)
diff --git a/targets/plugin/init.go b/targets/plugin/init.go
@@ -11,6 +11,7 @@ import (
 )
 
 func init() {
+	targets.RegisterBuildTarget(debian.TrixieDefaultTargetKey, debian.TrixieConfig.Handle)
 	targets.RegisterBuildTarget(debian.BookwormDefaultTargetKey, debian.BookwormConfig.Handle)
 	targets.RegisterBuildTarget(debian.BullseyeDefaultTargetKey, debian.BullseyeConfig.Handle)
 
diff --git a/test/target_debian_test.go b/test/target_debian_test.go
@@ -9,6 +9,21 @@ import (
 	gwclient "github.com/moby/buildkit/frontend/gateway/client"
 )
 
+func TestTrixie(t *testing.T) {
+	t.Parallel()
+
+	ctx := startTestSpan(baseCtx, t)
+	testConf := debLinuxTestConfigFor(
+		debian.TrixieDefaultTargetKey,
+		debian.TrixieConfig,
+		withPackageOverride("rust", "rust-all"),
+		withPackageOverride("bazel", "bazel-bootstrap"),
+	)
+
+	testLinuxDistro(ctx, t, testConf)
+	testDebianBaseDependencies(t, testConf.Target)
+}
+
 func TestBookworm(t *testing.T) {
 	t.Parallel()
 
diff --git a/website/docs/examples/targets.md b/website/docs/examples/targets.md
@@ -61,6 +61,10 @@ rockylinux9/container/depsonly   Builds a container image with only the runtime
 rockylinux9/rpm                  Builds an rpm and src.rpm.
 rockylinux9/rpm/debug            Debug options for rpm builds.
 rockylinux9/worker               Builds the base worker image responsible for building the rpm
+trixie/deb (default)             Builds a deb package.
+trixie/dsc                       Builds a Debian source package.
+trixie/testing/container         Builds a container image for testing purposes only.
+trixie/worker                    Builds the worker image.
 windowscross/container (default) Builds binaries and installs them into a Windows base image
 windowscross/worker              Builds the base worker image responsible for building the package
 windowscross/zip                 Builds binaries combined into a zip file
diff --git a/website/docs/targets.md b/website/docs/targets.md
@@ -16,6 +16,7 @@ DALEC includes a number of built-in targets that you can either use in your spec
 - `azlinux3` - Azure Linux 3
 - `bullseye` - Debian 11 (Bullseye) (v0.11)
 - `bookworm` - Debian 12 (Bookworm) (v0.11)
+- `trixie` - Debian 13 (Trixie) (v0.next)
 - `bionic` - Ubuntu 18.04 (Bionic) (v0.11)
 - `focal` - Ubuntu 20.04 (focal) (v0.11)
 - `jammy` - Ubuntu 22.04 (jammy) (v0.9)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"include":[{"target":"bookworm/worker"},{"target":"bullseye/worker"},{"target":"bionic/worker"},{"target":"focal/worker"},{"target":"jammy/worker"},{"target":"noble/worker"},{"target":"almalinux8/worker"},{"target":"almalinux9/worker"},{"target":"rockylinux8/worker"},{"target":"rockylinux9/worker"},{"target":"mariner2/worker"},{"target":"azlinux3/worker"},{"target":"windowscross/worker"}]}`
	`1`	`+{"include":[{"target":"trixie/worker"},{"target":"bookworm/worker"},{"target":"bullseye/worker"},{"target":"bionic/worker"},{"target":"focal/worker"},{"target":"jammy/worker"},{"target":"noble/worker"},{"target":"almalinux8/worker"},{"target":"almalinux9/worker"},{"target":"rockylinux8/worker"},{"target":"rockylinux9/worker"},{"target":"mariner2/worker"},{"target":"azlinux3/worker"},{"target":"windowscross/worker"}]}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ target "maps-dep" {`
`66`	`66`	`"dalec_frontend" = "target:frontend"`
`67`	`67`	`}`
`68`	`68`	`matrix = {`
`69`		`- tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "bookworm/deb", "bullseye/deb"]`
	`69`	`+ tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "trixie/deb", "bookworm/deb", "bullseye/deb"]`
`70`	`70`	`}`
`71`	`71`	`target = tgt`
`72`	`72`	`}`
`@@ -81,7 +81,7 @@ target "maps-buildstep" {`
`81`	`81`	`"dalec_frontend" = "target:frontend"`
`82`	`82`	`}`
`83`	`83`	`matrix = {`
`84`		`- tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "bookworm/deb", "bullseye/deb"]`
	`84`	`+ tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "trixie/deb", "bookworm/deb", "bullseye/deb"]`
`85`	`85`	`}`
`86`	`86`	`target = tgt`
`87`	`87`	`}`
`@@ -96,7 +96,7 @@ target "maps-test" {`
`96`	`96`	`"dalec_frontend" = "target:frontend"`
`97`	`97`	`}`
`98`	`98`	`matrix = {`
`99`		`- tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "bookworm/deb", "bullseye/deb"]`
	`99`	`+ tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "trixie/deb", "bookworm/deb", "bullseye/deb"]`
`100`	`100`	`}`
`101`	`101`	`target = tgt`
`102`	`102`	`}`
`@@ -111,7 +111,7 @@ target "maps-source" {`
`111`	`111`	`"dalec_frontend" = "target:frontend"`
`112`	`112`	`}`
`113`	`113`	`matrix = {`
`114`		`- tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "bookworm/deb", "bullseye/deb"]`
	`114`	`+ tgt = ["azlinux3/rpm", "mariner2/rpm", "jammy/deb", "noble/deb", "trixie/deb", "bookworm/deb", "bullseye/deb"]`
`115`	`115`	`}`
`116`	`116`	`target = tgt`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ var (`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`targets = map[string]gwclient.BuildFunc{`
	`33`	`+ TrixieDefaultTargetKey: TrixieConfig.Handle,`
`33`	`34`	`BookwormDefaultTargetKey: BookwormConfig.Handle,`
`34`	`35`	`BullseyeDefaultTargetKey: BullseyeConfig.Handle,`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func init() {`
	`14`	`+ targets.RegisterBuildTarget(debian.TrixieDefaultTargetKey, debian.TrixieConfig.Handle)`
`14`	`15`	`targets.RegisterBuildTarget(debian.BookwormDefaultTargetKey, debian.BookwormConfig.Handle)`
`15`	`16`	`targets.RegisterBuildTarget(debian.BullseyeDefaultTargetKey, debian.BullseyeConfig.Handle)`
`16`	`17`