🔧 Add matrix builds for Bookworm and Trixie variants

Author: bdsoha

.github/workflows/build.yaml

@@ -24,6 +24,16 @@ jobs:
     needs:
       - lint
 
+    strategy:
+      matrix:
+        variant:
+          - name: bookworm
+            tag: 12.12
+            latest: true
+          - name: trixie
+            tag: 13.1
+            latest: false
+
     permissions:
       contents: read
       packages: write
@@ -48,9 +58,11 @@ jobs:
         with:
           images: ghcr.io/${{ github.repository }}
           flavor: |
-            latest=false
+            latest=${{ matrix.variant.latest }}
+            suffix=-${{ matrix.variant.name }},onlatest=true
           tags: |
-            type=raw,value=latest
+            type=raw,value=latest,enable=${{ matrix.variant.latest }}
+            type=raw,value=${{ matrix.variant.name }}
             type=semver,pattern=v{{version}}
             type=semver,pattern=v{{major}}.{{minor}}
 
@@ -60,6 +72,8 @@ jobs:
         env:
           DOCKER_BUILD_SUMMARY: true
         with:
+          build-args: |
+            tag=${{ matrix.variant.tag }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           context: .

Dockerfile

@@ -16,16 +16,17 @@ COPY src/rootfs /
 ### Install helper requirements
 RUN DEBIAN_FRONTEND=noninteractive \
   apt-get update \
-  && apt-get satisfy -y --no-install-recommends \
-    "locales" \
+  && apt-get install -y --no-install-recommends \
+    locales \
   && locale-gen \
-  && apt-get satisfy -y --no-install-recommends \
-    "ca-certificates (>=20230311)" \
-    "curl (>=7.88)" \
-    "gnupg (>=2.2)" \
-    "unzip (>=6.0)" \
-    "wget (>=1.21)" \
-    "zsh (>=5.9)" \
+  && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    gnupg \
+    unzip \
+    wget \
+    xz-utils \
+    zsh \
   && /usr/libexec/kloudkit/apt-cleanup
 
 ### Add docker group and application user

README.md

@@ -10,15 +10,22 @@
 ---
 
 ```sh
-# TL;DR  🐳 grab the latest layer
+# TL;DR  🐳 grab the latest layer (Bookworm by default)
 docker pull ghcr.io/kloudkit/base-image:latest
+
+# Or choose a specific Debian version
+docker pull ghcr.io/kloudkit/base-image:bookworm  # Debian 12
+docker pull ghcr.io/kloudkit/base-image:trixie    # Debian 13
 ```
 
 Use it as the first `FROM` in any KloudKIT-compatible Dockerfile:
 
 ```dockerfile
 FROM ghcr.io/kloudkit/base-image:latest
 # …install your app here…
+
+# Or target a specific version
+FROM ghcr.io/kloudkit/base-image:bookworm
 ```
 
 ## What's Inside
@@ -28,7 +35,7 @@ This ultra-minimal base layer provides:
 - **Size-optimized Debian** with aggressive cleanup configurations.
 - **Essential tools** like `curl`, `wget`, `gnupg`, and `unzip` pre-installed.
 - **Smart package management** that blocks unnecessary services by default.
-- **Multi-version support** with opt-in access to newer Debian releases.
+- **Multiple Debian versions** with dedicated Bookworm and Trixie variants.
 - **Security hardening** with sensible defaults for container environments.
 - **User setup** with a non-root `kloud` user ready for your applications.
 
@@ -37,9 +44,20 @@ This ultra-minimal base layer provides:
 - **Smaller images:** Extensive file exclusions and package filtering reduce bloat.
 - **Faster builds:**Common tools pre-installed, optimized APT configuration.
 - **Consistent foundation:** All KloudKIT projects start from the same reliable base.
-- **Flexible packaging:** Access to both stable and testing repositories when needed.
+- **Version flexibility:** Choose between stable Bookworm or newer Trixie variants.
 - **Production ready:** Battle-tested configurations used across KloudKIT infrastructure.
 
+## Available Tags
+
+| Tag               | Debian Version  | Description                         |
+| ----------------- | --------------- | ----------------------------------- |
+| `latest`          | 12 *(Bookworm)* | Default, stable release             |
+| `bookworm`        | 12 *(Bookworm)* | Explicit stable version             |
+| `trixie`          | 13 *(Trixie)*   | Testing release with newer packages |
+| `v0.0.1`          | 12 *(Bookworm)* | Versioned stable release            |
+| `v0.0.1-bookworm` | 12 *(Bookworm)* | Versioned Bookworm variant          |
+| `v0.0.1-trixie`   | 13 *(Trixie)*   | Versioned Trixie variant            |
+
 ## Getting Started
 
 The base image includes everything needed for most containerized applications.