🔧 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
@@ -50,16 +60,21 @@ jobs:
           flavor: |
             latest=false
           tags: |
-            type=raw,value=latest
-            type=semver,pattern=v{{version}}
-            type=semver,pattern=v{{major}}.{{minor}}
+            type=raw,value=latest,enable=${{ matrix.variant.latest }}
+            type=raw,value=${{ matrix.variant.name }}
+            type=semver,pattern=v{{version}},enable=${{ matrix.variant.latest }}
+            type=semver,pattern=v{{major}}.{{minor}},enable=${{ matrix.variant.latest }}
+            type=semver,pattern=v{{version}}-${{ matrix.variant.name }}
+            type=semver,pattern=v{{major}}.{{minor}}-${{ matrix.variant.name }}
 
       - name: 🐳 Docker Build & Push
         uses: docker/build-push-action@v6
         id: docker_build
         env:
           DOCKER_BUILD_SUMMARY: true
         with:
+          build-args: |
+            tag=${{ matrix.variant.tag }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           context: .

Dockerfile

@@ -1,4 +1,4 @@
-ARG tag=12.11
+ARG tag
 
 ################################## Base Layer ##################################
 
@@ -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

@@ -3,22 +3,29 @@
 > 📦 **Minimal Debian layer** that underpins *every* KloudKIT container
 
 [![Stars](https://img.shields.io/github/stars/kloudkit/base-image?style=for-the-badge&logo=git&logoColor=c6d0f5&labelColor=414559&color=f0c6c6)](https://github.com/kloudkit/base-image/stargazers)
-[![Docker](https://img.shields.io/badge/latest-a?style=for-the-badge&logo=docker&logoColor=c6d0f5&label=docker&labelColor=414559&color=ef9f76)](https://github.com/kloudkit/base-image/pkgs/container/base-image)
+[![Docker](https://img.shields.io/badge/v0.0.3-a?style=for-the-badge&logo=docker&logoColor=c6d0f5&label=docker&labelColor=414559&color=ef9f76)](https://github.com/kloudkit/base-image/pkgs/container/base-image)
 [![Build](https://img.shields.io/github/actions/workflow/status/kloudkit/base-image/build.yaml?style=for-the-badge&logo=githubactions&logoColor=c6d0f5&label=build&labelColor=414559&color=a6da95)](https://github.com/kloudkit/base-image/actions/workflows/build.yaml)
 [![License](https://img.shields.io/github/license/kloudkit/base-image?style=for-the-badge&logo=opensourceinitiative&logoColor=c6d0f5&labelColor=414559&color=8caaee)](https://github.com/kloudkit/base-image/blob/main/LICENSE)
 
 ---
 
 ```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,18 +35,33 @@ 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.
+- **Multi-architecture support** with ARM64 and AMD64 builds for broad compatibility.
 - **Security hardening** with sensible defaults for container environments.
 - **User setup** with a non-root `kloud` user ready for your applications.
 
 ## Why Use This Base
 
 - **Smaller images:** Extensive file exclusions and package filtering reduce bloat.
-- **Faster builds:**Common tools pre-installed, optimized APT configuration.
+- **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.3`          | 12 *(Bookworm)* | Versioned stable release (latest)      |
+| `v0.0`            | 12 *(Bookworm)* | Major.minor versioned release (latest) |
+| `v0.0.3-bookworm` | 12 *(Bookworm)* | Versioned Bookworm variant             |
+| `v0.0.3-trixie`   | 13 *(Trixie)*   | Versioned Trixie variant               |
+| `v0.0-bookworm`   | 12 *(Bookworm)* | Major.minor Bookworm variant           |
+| `v0.0-trixie`     | 13 *(Trixie)*   | Major.minor Trixie variant             |
+
 ## Getting Started
 
 The base image includes everything needed for most containerized applications.