image builds

Author: binarypie

.github/workflows/build-disk.yml

@@ -1,5 +1,5 @@
 ---
-name: Build ISO images
+name: Build ISO image
 
 on:
   workflow_dispatch:
@@ -24,16 +24,8 @@ concurrency:
 
 jobs:
   build:
-    name: Build ISO (${{ matrix.variant.name }})
+    name: Build ISO
     runs-on: ubuntu-24.04
-    strategy:
-      fail-fast: false
-      matrix:
-        variant:
-          - name: "main"
-            tag: "latest"
-          - name: "nvidia"
-            tag: "latest-nvidia"
     permissions:
       contents: write
       packages: read
@@ -55,7 +47,7 @@ jobs:
         id: build
         uses: binarypie-dev/titanoboa@main
         with:
-          image-ref: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.variant.tag }}
+          image-ref: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
           iso-dest: ${{ github.workspace }}/output.iso
           builder-distro: fedora
           livesys: true
@@ -68,7 +60,7 @@ jobs:
         run: |
           set -x
           mkdir -p output
-          NEW_NAME="${{ env.IMAGE_NAME }}-${{ matrix.variant.name }}.iso"
+          NEW_NAME="${{ env.IMAGE_NAME }}.iso"
           mv "${{ steps.build.outputs.iso-dest }}" "output/$NEW_NAME"
           (cd output && sha256sum "$NEW_NAME" | tee "$NEW_NAME.sha256")
           echo "iso-path=output/$NEW_NAME" >> $GITHUB_OUTPUT
@@ -77,7 +69,7 @@ jobs:
       - name: Upload ISO as artifact
         uses: actions/upload-artifact@v6
         with:
-          name: ${{ env.IMAGE_NAME }}-${{ matrix.variant.name }}-iso
+          name: ${{ env.IMAGE_NAME }}-iso
           path: output/
           if-no-files-found: error
           retention-days: 7

.github/workflows/build.yml

@@ -15,12 +15,13 @@ on:
 
 env:
   IMAGE_DESC: "Hypercube - A developer workstation with Hyprland built on Universal Blue"
-  IMAGE_KEYWORDS: "bootc,ublue,universal-blue,hyprland,hypercube,wayland,developer"
+  IMAGE_KEYWORDS: "bootc,ublue,universal-blue,hyprland,hypercube,wayland,developer,nvidia"
   IMAGE_LOGO_URL: "https://raw.githubusercontent.com/${{ github.repository_owner }}/${{ github.event.repository.name }}/main/branding/hypercube-logo.png"
   IMAGE_NAME: "${{ github.event.repository.name }}"
   IMAGE_REGISTRY: "ghcr.io/${{ github.repository_owner }}"
   DEFAULT_TAG: "latest"
   FEDORA_VERSION: "43"
+  AKMODS_FLAVOR: "coreos-stable"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
@@ -36,19 +37,6 @@ jobs:
       packages: write
       id-token: write
 
-    strategy:
-      fail-fast: false
-      matrix:
-        variant:
-          - flavor: "main"
-            source_image: "base"
-            source_suffix: "-main"
-            tag_suffix: ""
-          - flavor: "nvidia"
-            source_image: "base"
-            source_suffix: "-nvidia"
-            tag_suffix: "-nvidia"
-
     steps:
       - name: Prepare environment
         run: |
@@ -73,11 +61,12 @@ jobs:
         id: metadata
         with:
           tags: |
-            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 }}
+            type=raw,value=${{ env.DEFAULT_TAG }}
+            type=raw,value=${{ env.DEFAULT_TAG }}.{{date 'YYYYMMDD'}}
+            type=raw,value=${{ env.FEDORA_VERSION }}
+            type=raw,value={{date 'YYYYMMDD'}}
+            type=sha,enable=${{ github.event_name == 'pull_request' }}
+            type=ref,event=pr
           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 }}
@@ -107,12 +96,10 @@ jobs:
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
           build-args: |
-            SOURCE_IMAGE=${{ matrix.variant.source_image }}
-            SOURCE_SUFFIX=${{ matrix.variant.source_suffix }}
             FEDORA_VERSION=${{ env.FEDORA_VERSION }}
             IMAGE_NAME=${{ env.IMAGE_NAME }}
             IMAGE_VENDOR=${{ github.repository_owner }}
-            IMAGE_FLAVOR=${{ matrix.variant.flavor }}
+            AKMODS_FLAVOR=${{ env.AKMODS_FLAVOR }}
           oci: false
 
       - name: Login to GitHub Container Registry

Containerfile

@@ -1,16 +1,15 @@
-# Hypercube v2 Container Build
-# Built from ublue-os/base-main (pure Hyprland, no GNOME)
+# Hypercube Container Build
+# Built from ublue-os/base-main with NVIDIA support included
+# Single unified image for all hardware configurations
 
 # ============================================
 # Build Arguments
 # ============================================
-ARG SOURCE_IMAGE="base"
-ARG SOURCE_SUFFIX="-main"
 ARG FEDORA_VERSION="43"
 ARG IMAGE_NAME=hypercube
 ARG IMAGE_VENDOR=binarypie-dev
-ARG IMAGE_FLAVOR="main"
 ARG SHA_HEAD_SHORT=""
+ARG AKMODS_FLAVOR="coreos-stable"
 
 # ============================================
 # Stage 1: Context Aggregation
@@ -23,20 +22,20 @@ COPY build_files /build_files
 # ============================================
 # Stage 2: Main Build
 # ============================================
-FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${FEDORA_VERSION}
+FROM ghcr.io/ublue-os/base-main:${FEDORA_VERSION}
 
 # Re-declare ARGs after FROM (they don't persist across stages)
 ARG IMAGE_NAME
 ARG IMAGE_VENDOR
-ARG IMAGE_FLAVOR
 ARG SHA_HEAD_SHORT
 ARG FEDORA_VERSION
+ARG AKMODS_FLAVOR
 
 # Export build-time environment variables
 ENV IMAGE_NAME=${IMAGE_NAME}
 ENV IMAGE_VENDOR=${IMAGE_VENDOR}
-ENV IMAGE_FLAVOR=${IMAGE_FLAVOR}
 ENV FEDORA_VERSION=${FEDORA_VERSION}
+ENV AKMODS_FLAVOR=${AKMODS_FLAVOR}
 
 # Copy dot_files (config templates) into the image
 COPY dot_files /usr/share/hypercube/config

Justfile

@@ -1,11 +1,11 @@
 # Hypercube Build System
+# Single unified image with NVIDIA support included
 
 # Configuration
 export repo_organization := env("REPO_ORGANIZATION", "binarypie-dev")
 export image_name := env("IMAGE_NAME", "hypercube")
-export base_image := env("BASE_IMAGE", "ghcr.io/ublue-os/base-main")
-export base_image_nvidia := env("BASE_IMAGE_NVIDIA", "ghcr.io/ublue-os/base-nvidia")
-export default_tag := env("DEFAULT_TAG", "stable-daily")
+export fedora_version := env("FEDORA_VERSION", "43")
+export akmods_flavor := env("AKMODS_FLAVOR", "coreos-stable")
 
 # Runtime detection
 export SUDO := if `id -u` == "0" { "" } else { "sudo" }
@@ -21,30 +21,22 @@ default:
 
 # Build container image
 [group('Build')]
-build flavor="main" ghcr="0":
+build ghcr="0":
     #!/usr/bin/env bash
     set -euo pipefail
 
-    # Determine base image based on flavor
-    if [[ "{{ flavor }}" == "nvidia" ]]; then
-        BASE="{{ base_image_nvidia }}:{{ default_tag }}"
-        TAG="{{ default_tag }}-nvidia"
-    else
-        BASE="{{ base_image }}:{{ default_tag }}"
-        TAG="{{ default_tag }}"
-    fi
-
-    IMAGE_FULL="{{ image_name }}:${TAG}"
+    IMAGE_FULL="{{ image_name }}:{{ fedora_version }}"
 
     echo "========================================"
     echo "Building: ${IMAGE_FULL}"
-    echo "Base:     ${BASE}"
+    echo "Base:     ghcr.io/ublue-os/base-main:{{ fedora_version }}"
     echo "========================================"
 
     BUILD_ARGS=()
-    BUILD_ARGS+=("--build-arg" "BASE_IMAGE=${BASE}")
+    BUILD_ARGS+=("--build-arg" "FEDORA_VERSION={{ fedora_version }}")
     BUILD_ARGS+=("--build-arg" "IMAGE_NAME={{ image_name }}")
     BUILD_ARGS+=("--build-arg" "IMAGE_VENDOR={{ repo_organization }}")
+    BUILD_ARGS+=("--build-arg" "AKMODS_FLAVOR={{ akmods_flavor }}")
 
     if [[ -z "$(git status -s)" ]]; then
         BUILD_ARGS+=("--build-arg" "SHA_HEAD_SHORT=$(git rev-parse --short HEAD)")
@@ -72,33 +64,18 @@ build flavor="main" ghcr="0":
 
 # Build for GHCR push (rootful)
 [group('Build')]
-build-ghcr flavor="main":
-    @just build {{ flavor }} 1
-
-# Build both flavors
-[group('Build')]
-build-all:
-    @echo "Building main flavor..."
-    @just build main
-    @echo ""
-    @echo "Building nvidia flavor..."
-    @just build nvidia
+build-ghcr:
+    @just build 1
 
 # Run container interactively for testing
 [group('Build')]
-run flavor="main":
+run:
     #!/usr/bin/env bash
     set -euo pipefail
 
-    if [[ "{{ flavor }}" == "nvidia" ]]; then
-        TAG="{{ default_tag }}-nvidia"
-    else
-        TAG="{{ default_tag }}"
-    fi
-
     {{ PODMAN }} run -it --rm \
         --privileged \
-        "localhost/{{ image_name }}:${TAG}" \
+        "localhost/{{ image_name }}:{{ fedora_version }}" \
         /bin/bash
 
 # ============================================
@@ -205,21 +182,14 @@ _titanoboa-setup:
 
 # Build ISO from local image using a temporary local registry
 [group('ISO')]
-build-iso-local flavor="main": _titanoboa-setup
+build-iso-local: _titanoboa-setup
     #!/usr/bin/bash
     set -euo pipefail
 
     REGISTRY_PORT=5000
     REGISTRY_NAME="hypercube-registry"
-
-    if [[ "{{ flavor }}" == "nvidia" ]]; then
-        TAG="{{ default_tag }}-nvidia"
-        ISO_NAME="{{ image_name }}-nvidia.iso"
-    else
-        TAG="{{ default_tag }}"
-        ISO_NAME="{{ image_name }}.iso"
-    fi
-
+    TAG="{{ fedora_version }}"
+    ISO_NAME="{{ image_name }}.iso"
     LOCAL_IMAGE="localhost/{{ image_name }}:${TAG}"
 
     # Get the host IP address that the chroot can reach
@@ -237,7 +207,7 @@ build-iso-local flavor="main": _titanoboa-setup
     # Check if image exists in user storage
     ID=$({{ PODMAN }} images --filter reference="${LOCAL_IMAGE}" --format "{{{{.ID}}}}")
     if [[ -z "$ID" ]]; then
-        echo "Error: Image ${LOCAL_IMAGE} not found. Run 'just build {{ flavor }}' first."
+        echo "Error: Image ${LOCAL_IMAGE} not found. Run 'just build' first."
         exit 1
     fi
 
@@ -324,21 +294,12 @@ build-iso-local flavor="main": _titanoboa-setup
 
 # Build ISO from GHCR image
 [group('ISO')]
-build-iso-ghcr flavor="main": _titanoboa-setup
+build-iso-ghcr: _titanoboa-setup
     #!/usr/bin/bash
     set -euo pipefail
 
-    REGISTRY="ghcr.io/{{ repo_organization }}"
-
-    if [[ "{{ flavor }}" == "nvidia" ]]; then
-        TAG="latest-nvidia"
-        ISO_NAME="{{ image_name }}-nvidia.iso"
-    else
-        TAG="latest"
-        ISO_NAME="{{ image_name }}.iso"
-    fi
-
-    IMAGE_FULL="${REGISTRY}/{{ image_name }}:${TAG}"
+    IMAGE_FULL="ghcr.io/{{ repo_organization }}/{{ image_name }}:latest"
+    ISO_NAME="{{ image_name }}.iso"
 
     echo "Building ISO for ${IMAGE_FULL}..."