First version

Author: binarypie

.github/workflows/build.yml

@@ -35,6 +35,15 @@ jobs:
       packages: write
       id-token: write
 
+    strategy:
+      fail-fast: false
+      matrix:
+        variant:
+          - base_image: "ghcr.io/ublue-os/bluefin-dx:stable-daily"
+            tag_suffix: ""
+          - base_image: "ghcr.io/ublue-os/bluefin-dx-nvidia:stable-daily"
+            tag_suffix: "-nvidia"
+
     steps:
       - name: Prepare environment
         run: |
@@ -80,12 +89,13 @@ jobs:
         with:
           # This generates all the tags for your image, you can add custom tags here too!
           # Default tags are "$DEFAULT_TAG" and "$DEFAULT_TAG.$date".
+          # Matrix tag_suffix is appended to differentiate variants (e.g., latest vs latest-nvidia)
           tags: |
-            type=raw,value=${{ env.DEFAULT_TAG }}
-            type=raw,value=${{ env.DEFAULT_TAG }}.{{date 'YYYYMMDD'}}
-            type=raw,value={{date 'YYYYMMDD'}}
-            type=sha,enable=${{ github.event_name == 'pull_request' }}
-            type=ref,event=pr
+            type=raw,value=${{ env.DEFAULT_TAG }}${{ matrix.variant.tag_suffix }}
+            type=raw,value=${{ env.DEFAULT_TAG }}${{ matrix.variant.tag_suffix }}.{{date 'YYYYMMDD'}}
+            type=raw,value={{date 'YYYYMMDD'}}${{ matrix.variant.tag_suffix }}
+            type=sha,enable=${{ github.event_name == 'pull_request' }},suffix=${{ matrix.variant.tag_suffix }}
+            type=ref,event=pr,suffix=${{ matrix.variant.tag_suffix }}
           labels: |
             io.artifacthub.package.readme-url=https://raw.githubusercontent.com/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}/refs/heads/main/README.md
             org.opencontainers.image.created=${{ steps.date.outputs.date }}
@@ -116,6 +126,8 @@ jobs:
           image: ${{ env.IMAGE_NAME }}
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
+          build-args: |
+            BASE_IMAGE=${{ matrix.variant.base_image }}
           oci: false
 
       # Rechunk is a script that we use on Universal Blue to make sure there isnt a single huge layer when your image gets published.

Containerfile

@@ -3,12 +3,14 @@ FROM scratch AS ctx
 COPY build_files /
 
 # Base Image
-FROM ghcr.io/ublue-os/bazzite:stable
+# This build argument allows building different variants (regular vs NVIDIA)
+ARG BASE_IMAGE=ghcr.io/ublue-os/bluefin-dx:stable-daily
+FROM ${BASE_IMAGE}
 
 ## Other possible base images include:
 # FROM ghcr.io/ublue-os/bazzite:latest
-# FROM ghcr.io/ublue-os/bluefin-nvidia:stable
-# 
+# FROM ghcr.io/ublue-os/bluefin-dx-nvidia:stable-daily
+#
 # ... and so on, here are more base images
 # Universal Blue Images: https://github.com/orgs/ublue-os/packages
 # Fedora base image: quay.io/fedora/fedora-bootc:41
@@ -19,11 +21,12 @@ FROM ghcr.io/ublue-os/bazzite:stable
 ## the following RUN directive does all the things required to run "build.sh" as recommended.
 
 RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
-    --mount=type=cache,dst=/var/cache \
-    --mount=type=cache,dst=/var/log \
-    --mount=type=tmpfs,dst=/tmp \
-    /ctx/build.sh
-    
+  --mount=type=cache,dst=/var/cache \
+  --mount=type=cache,dst=/var/log \
+  --mount=type=tmpfs,dst=/tmp \
+  /ctx/build.sh && \
+  ostree container commit
+
 ### LINTING
 ## Verify final image and contents are correct.
 RUN bootc container lint

Justfile

@@ -1,6 +1,8 @@
 export image_name := env("IMAGE_NAME", "image-template") # output image name, usually same as repo name, change as needed
 export default_tag := env("DEFAULT_TAG", "latest")
 export bib_image := env("BIB_IMAGE", "quay.io/centos-bootc/bootc-image-builder:latest")
+export base_image := env("BASE_IMAGE", "ghcr.io/ublue-os/bluefin-dx:stable-daily")
+export base_image_nvidia := env("BASE_IMAGE_NVIDIA", "ghcr.io/ublue-os/bluefin-dx-nvidia:stable-daily")
 
 alias build-vm := build-qcow2
 alias rebuild-vm := rebuild-qcow2
@@ -73,33 +75,55 @@ sudoif command *args:
 # Arguments:
 #   $target_image - The tag you want to apply to the image (default: $image_name).
 #   $tag - The tag for the image (default: $default_tag).
+#   $base_img - The base image to use (default: $base_image).
 #
 # The script constructs the version string using the tag and the current date.
 # If the git working directory is clean, it also includes the short SHA of the current HEAD.
 #
-# just build $target_image $tag
+# just build $target_image $tag $base_img
 #
 # Example usage:
-#   just build aurora lts
+#   just build binaryos latest
+#   just build binaryos nvidia ghcr.io/ublue-os/bluefin-dx-nvidia:stable-daily
 #
-# This will build an image 'aurora:lts' with DX and GDX enabled.
+# This will build an image with the specified base image.
 #
 
 # Build the image using the specified parameters
-build $target_image=image_name $tag=default_tag:
+build $target_image=image_name $tag=default_tag $base_img=base_image:
     #!/usr/bin/env bash
 
     BUILD_ARGS=()
+    BUILD_ARGS+=("--build-arg" "BASE_IMAGE={{ base_img }}")
+
     if [[ -z "$(git status -s)" ]]; then
         BUILD_ARGS+=("--build-arg" "SHA_HEAD_SHORT=$(git rev-parse --short HEAD)")
     fi
 
     podman build \
         "${BUILD_ARGS[@]}" \
         --pull=newer \
-        --tag "${target_image}:${tag}" \
+        --tag "{{ target_image }}:{{ tag }}" \
         .
 
+# Build the regular (non-NVIDIA) variant
+[group('Build Variants')]
+build-regular $target_image=image_name:
+    @just build "{{ target_image }}" "{{ default_tag }}" "{{ base_image }}"
+
+# Build the NVIDIA variant
+[group('Build Variants')]
+build-nvidia $target_image=image_name:
+    @just build "{{ target_image }}" "{{ default_tag }}-nvidia" "{{ base_image_nvidia }}"
+
+# Build both variants (regular and NVIDIA)
+[group('Build Variants')]
+build-all $target_image=image_name:
+    @echo "Building regular variant..."
+    @just build-regular "{{ target_image }}"
+    @echo "Building NVIDIA variant..."
+    @just build-nvidia "{{ target_image }}"
+
 # Command: _rootful_load_image
 # Description: This script checks if the current user is root or running under sudo. If not, it attempts to resolve the image tag using podman inspect.
 #              If the image is found, it loads it into rootful podman. If the image is not found, it pulls it from the repository.