From 940b77a6389b42b069c334ce95f63a1e0bb2fc66 Mon Sep 17 00:00:00 2001 From: "mergeraptor[bot]" <267480593+mergeraptor[bot]@users.noreply.github.com> Date: Sun, 6 Sep 2026 03:20:41 +0000 Subject: [PATCH 01/15] chore(deps): update ghcr.io/ublue-os/brew docker digest to d52b3f5 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index fa5246d3..85c66d30 100644 --- a/Containerfile +++ b/Containerfile @@ -10,7 +10,7 @@ ARG PACKAGE_IMAGE_REF=${PACKAGE_IMAGE}@${PACKAGE_IMAGE_SHA} ARG COMMON_IMAGE=ghcr.io/projectbluefin/common ARG COMMON_IMAGE_SHA=sha256:fb943c87866292fb74eb74610e9cd08a1a91fe42e763e28473f3f57cf18f26a5 ARG BREW_IMAGE=ghcr.io/ublue-os/brew -ARG BREW_IMAGE_SHA=sha256:8f952ae54585db9f855a306ef365e13609ed7c7944b12b823ba7d5ce8e1a145b +ARG BREW_IMAGE_SHA=sha256:d52b3f578f01623636aff534291b0bd8ff0a0244ef225bf51aecb5fa05a137af FROM ${COMMON_IMAGE}@${COMMON_IMAGE_SHA} AS common FROM ${BREW_IMAGE}@${BREW_IMAGE_SHA} AS brew From ef02e44eb821ae2303ca1f8193b985da26814a68 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Sun, 6 Sep 2026 02:41:15 -0400 Subject: [PATCH 02/15] fix: create libexec before installing scripts Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- Containerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 85c66d30..5ddb214b 100644 --- a/Containerfile +++ b/Containerfile @@ -68,7 +68,8 @@ COPY --from=common /system_files/bluefin /tmp/utah-bluefin COPY --from=brew /system_files /tmp/utah-brew COPY system_files/shared /tmp/utah-local -RUN for pair in install-packages.py:utah-install-packages \ +RUN mkdir -p /usr/local/libexec && \ + for pair in install-packages.py:utah-install-packages \ verify-rpm-contract.py:utah-verify-rpm-contract \ build-gnome-extensions.sh:utah-build-gnome-extensions \ install-ogc-kernel.sh:utah-install-ogc-kernel \ From afb6b9c6451e9fc78bcce6b4615775d5adeee307 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Sun, 6 Sep 2026 02:50:04 -0400 Subject: [PATCH 03/15] chore: certify CI fix under DCO Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: sec-check[bot] From 6626b426430d19e2c8522fb295c9b8fbda6c941d Mon Sep 17 00:00:00 2001 From: GitHub Copilot <223556219+Copilot@users.noreply.github.com> Date: Sun, 6 Sep 2026 06:45:03 -0400 Subject: [PATCH 04/15] fix: pin complete Utah package repository The previous package image omitted the contract RPMs required by the image resolver, causing CI to fail with No match for argument errors. Pin the published repository digest that contains the complete dependency set. Assisted-by: Claude Sonnet 5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: GitHub Copilot <223556219+Copilot@users.noreply.github.com> --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 5ddb214b..4bdd772d 100644 --- a/Containerfile +++ b/Containerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:c5539f9ed4d9 # Keep this pin in Utah so an image build is reproducible and can be reviewed # against the exact package set it consumes. ARG PACKAGE_IMAGE=ghcr.io/projectbluefin/utah-packages -ARG PACKAGE_IMAGE_SHA=sha256:2848c60d51fc6d75c3c89b246aad0e5ebf1fe84c5b7696203f02f14727bd158b +ARG PACKAGE_IMAGE_SHA=sha256:9cb667291a1a0b112c39d3c6a69116bb52cb1a10c7df12290b9c298b5682426c # CI keeps PACKAGE_IMAGE_SHA pinned. PACKAGE_IMAGE_REF supports a local image # in containers-storage, where no registry digest is available. ARG PACKAGE_IMAGE_REF=${PACKAGE_IMAGE}@${PACKAGE_IMAGE_SHA} From 822e6d848cba48afe26ce0f6c5f58aa7ea3d3919 Mon Sep 17 00:00:00 2001 From: GitHub Copilot <223556219+Copilot@users.noreply.github.com> Date: Sun, 6 Sep 2026 14:40:08 -0400 Subject: [PATCH 05/15] fix: create libexec for every build stage Signed-off-by: GitHub Copilot <223556219+Copilot@users.noreply.github.com> --- Containerfile.kernel | 1 + 1 file changed, 1 insertion(+) diff --git a/Containerfile.kernel b/Containerfile.kernel index aa4d174f..94f51404 100644 --- a/Containerfile.kernel +++ b/Containerfile.kernel @@ -25,6 +25,7 @@ FROM ${BASE_IMAGE} AS builder # buildroot. Fedora is builder-only; it is not copied into the runtime stage. COPY packages/hummingbird.repo /etc/yum.repos.d/hummingbird.repo COPY packages/fedora-44.repo /etc/yum.repos.d/fedora-44.repo +RUN mkdir -p /usr/local/libexec COPY scripts/install-ogc-kernel.sh /usr/local/libexec/utah-install-ogc-kernel COPY scripts/install-nvidia.sh /usr/local/libexec/utah-install-nvidia From 0a0b99d4d4c696a9875815e92fa1404c55bd069d Mon Sep 17 00:00:00 2001 From: Copilot <223556219+Copilot@users.noreply.github.com> Date: Sun, 6 Sep 2026 22:48:51 -0400 Subject: [PATCH 06/15] fix: align image inputs with current package base Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Copilot <223556219+Copilot@users.noreply.github.com> --- Containerfile | 4 ++-- Containerfile.kernel | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 4bdd772d..9e119bd1 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:c5539f9ed4d93aab6bd41e4f5aef8ab83055f3f9e855a47b69fadb7420d0d1df +ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:4a3393125d2b0d9264f89a162659336b23d20c46ca9026ed7315d83d39a34293 # The package factory publishes a complete, digest-addressable RPM repository. # Keep this pin in Utah so an image build is reproducible and can be reviewed # against the exact package set it consumes. @@ -79,7 +79,7 @@ RUN mkdir -p /usr/local/libexec && \ configure-branding.sh:utah-configure-branding \ verify-desktop-contract.py:utah-verify-desktop-contract \ verify-gnome-extensions.py:utah-verify-gnome-extensions; do \ - install -m 0755 "/tmp/utah-scripts/${pair%%:*}" "/usr/local/libexec/${pair##*:}" || exit 1; \ + install -D -m 0755 "/tmp/utah-scripts/${pair%%:*}" "/usr/local/libexec/${pair##*:}" || exit 1; \ done && \ cp -a /tmp/utah-common/. / && \ cp -a /tmp/utah-bluefin/. / && \ diff --git a/Containerfile.kernel b/Containerfile.kernel index 94f51404..962b5416 100644 --- a/Containerfile.kernel +++ b/Containerfile.kernel @@ -16,7 +16,7 @@ # # The cache image's own build has no /utah-cache, so the same scripts take their # source-build path here. There is no second implementation to drift. -ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:c5539f9ed4d93aab6bd41e4f5aef8ab83055f3f9e855a47b69fadb7420d0d1df +ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:4a3393125d2b0d9264f89a162659336b23d20c46ca9026ed7315d83d39a34293 FROM ${BASE_IMAGE} AS builder From a1aeceb24dc5b2dc3adeaa3373cbd365f24d2665 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Mon, 7 Sep 2026 06:56:47 -0400 Subject: [PATCH 07/15] chore(ci): retrigger image builds after runner artifact failure Signed-off-by: sec-check[bot] From 84e8201c73a235bbfd4b16438dc36ccfc5ab0c76 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Mon, 7 Sep 2026 15:20:40 -0400 Subject: [PATCH 08/15] ci: retrigger failing image builds Signed-off-by: sec-check[bot] From 11319cdef2b755e880853cfa3f1a7963f7772c49 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2026 23:48:53 -0400 Subject: [PATCH 09/15] ci: rerun failing checks Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> From fccdd14cd8d861df9b4705d4b257d40d1fd797c4 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Wed, 9 Sep 2026 12:29:13 -0400 Subject: [PATCH 10/15] fix: skip unavailable service RPMs fwupd and tailscale are absent from the pinned Utah package repository. Record both parity gaps so the optional service hooks remain guarded and image installation can complete. Assisted-by: Claude Sonnet 5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: sec-check[bot] --- docs/skills/package-contract.md | 4 ++++ packages/utah.toml | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/docs/skills/package-contract.md b/docs/skills/package-contract.md index d19d53f3..ffdd2a87 100644 --- a/docs/skills/package-contract.md +++ b/docs/skills/package-contract.md @@ -109,6 +109,10 @@ about installation. fail fast on that case — names only, no versions — instead of discovering it twenty minutes into a build (recipe comment, `Justfile`, `check-repos`; needs network access). +- If a pinned repository loses an optional service RPM, move that name from + `[services]` to `[unavailable]` with a tracking issue. `configure-services.sh` + guards absent units, so this preserves the build while documenting the + parity gap. - `[unavailable]` entries still present in the install set are a validation error (`install-packages.py --check`). - Drift in `packages/bluefin.toml` from upstream is a CI failure diff --git a/packages/utah.toml b/packages/utah.toml index dbc79677..71f90c6b 100644 --- a/packages/utah.toml +++ b/packages/utah.toml @@ -109,6 +109,10 @@ packages = [ # ruby4.0. The two conflict on file paths, so the transaction fails. Needs # either a ruby exclusion in the buildroot or dropping the html subpackage. # +# fwupd, tailscale +# The pinned Utah package repository currently publishes neither service RPM. +# configure-services.sh treats both units as optional. Tracked by #35. +# # firefox # Bluefin's desktop contract names Firefox, but this factory currently only # carries mozjs140 (the embeddable JavaScript runtime), not the Firefox @@ -128,8 +132,10 @@ packages = [ "evolution-ews-core", "firefox", "fish", + "fwupd", "grub2-efi-x64-cdboot", "pipewire-libs-extra", + "tailscale", "zsh", ] From ff0a1ed003e74d6dcf468ac3e1e635cc871efb69 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Wed, 9 Sep 2026 13:12:11 -0400 Subject: [PATCH 11/15] Revert "fix: skip unavailable service RPMs" This reverts commit fccdd14cd8d861df9b4705d4b257d40d1fd797c4. --- docs/skills/package-contract.md | 4 ---- packages/utah.toml | 6 ------ 2 files changed, 10 deletions(-) diff --git a/docs/skills/package-contract.md b/docs/skills/package-contract.md index ffdd2a87..d19d53f3 100644 --- a/docs/skills/package-contract.md +++ b/docs/skills/package-contract.md @@ -109,10 +109,6 @@ about installation. fail fast on that case — names only, no versions — instead of discovering it twenty minutes into a build (recipe comment, `Justfile`, `check-repos`; needs network access). -- If a pinned repository loses an optional service RPM, move that name from - `[services]` to `[unavailable]` with a tracking issue. `configure-services.sh` - guards absent units, so this preserves the build while documenting the - parity gap. - `[unavailable]` entries still present in the install set are a validation error (`install-packages.py --check`). - Drift in `packages/bluefin.toml` from upstream is a CI failure diff --git a/packages/utah.toml b/packages/utah.toml index 71f90c6b..dbc79677 100644 --- a/packages/utah.toml +++ b/packages/utah.toml @@ -109,10 +109,6 @@ packages = [ # ruby4.0. The two conflict on file paths, so the transaction fails. Needs # either a ruby exclusion in the buildroot or dropping the html subpackage. # -# fwupd, tailscale -# The pinned Utah package repository currently publishes neither service RPM. -# configure-services.sh treats both units as optional. Tracked by #35. -# # firefox # Bluefin's desktop contract names Firefox, but this factory currently only # carries mozjs140 (the embeddable JavaScript runtime), not the Firefox @@ -132,10 +128,8 @@ packages = [ "evolution-ews-core", "firefox", "fish", - "fwupd", "grub2-efi-x64-cdboot", "pipewire-libs-extra", - "tailscale", "zsh", ] From fdef3d6e7a1c09e181c3633f02cf5993b4e86efa Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Wed, 9 Sep 2026 13:12:44 -0400 Subject: [PATCH 12/15] fix: match package repository to base image Restore the base and package repository pins as a compatible pair. The newer pair leaves the image transaction without required runtime dependencies. Assisted-by: Claude Sonnet 5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: sec-check[bot] --- Containerfile | 4 ++-- Containerfile.kernel | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 9e119bd1..9289bbc9 100644 --- a/Containerfile +++ b/Containerfile @@ -1,9 +1,9 @@ -ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:4a3393125d2b0d9264f89a162659336b23d20c46ca9026ed7315d83d39a34293 +ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:c5539f9ed4d93aab6bd41e4f5aef8ab83055f3f9e855a47b69fadb7420d0d1df # The package factory publishes a complete, digest-addressable RPM repository. # Keep this pin in Utah so an image build is reproducible and can be reviewed # against the exact package set it consumes. ARG PACKAGE_IMAGE=ghcr.io/projectbluefin/utah-packages -ARG PACKAGE_IMAGE_SHA=sha256:9cb667291a1a0b112c39d3c6a69116bb52cb1a10c7df12290b9c298b5682426c +ARG PACKAGE_IMAGE_SHA=sha256:2848c60d51fc6d75c3c89b246aad0e5ebf1fe84c5b7696203f02f14727bd158b # CI keeps PACKAGE_IMAGE_SHA pinned. PACKAGE_IMAGE_REF supports a local image # in containers-storage, where no registry digest is available. ARG PACKAGE_IMAGE_REF=${PACKAGE_IMAGE}@${PACKAGE_IMAGE_SHA} diff --git a/Containerfile.kernel b/Containerfile.kernel index 962b5416..94f51404 100644 --- a/Containerfile.kernel +++ b/Containerfile.kernel @@ -16,7 +16,7 @@ # # The cache image's own build has no /utah-cache, so the same scripts take their # source-build path here. There is no second implementation to drift. -ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:4a3393125d2b0d9264f89a162659336b23d20c46ca9026ed7315d83d39a34293 +ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:c5539f9ed4d93aab6bd41e4f5aef8ab83055f3f9e855a47b69fadb7420d0d1df FROM ${BASE_IMAGE} AS builder From 70e0e37384ad276874fda70b989c5d1bb1e6d055 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Wed, 9 Sep 2026 20:34:47 -0400 Subject: [PATCH 13/15] fix: let install create script destinations Signed-off-by: sec-check[bot] --- Containerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Containerfile b/Containerfile index 9289bbc9..c41d2ccc 100644 --- a/Containerfile +++ b/Containerfile @@ -68,7 +68,6 @@ COPY --from=common /system_files/bluefin /tmp/utah-bluefin COPY --from=brew /system_files /tmp/utah-brew COPY system_files/shared /tmp/utah-local -RUN mkdir -p /usr/local/libexec && \ for pair in install-packages.py:utah-install-packages \ verify-rpm-contract.py:utah-verify-rpm-contract \ build-gnome-extensions.sh:utah-build-gnome-extensions \ From 39db343698bab8a3514b475279d76e92d7016d30 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Thu, 10 Sep 2026 16:43:11 -0400 Subject: [PATCH 14/15] ci: retry transient failing checks Signed-off-by: sec-check[bot] From 3a87f53cf0e31c7284197108f27805ec3b9220c8 Mon Sep 17 00:00:00 2001 From: castrojo Date: Sun, 13 Sep 2026 19:09:52 -0400 Subject: [PATCH 15/15] fix: restore RUN instruction in Containerfile --- Containerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Containerfile b/Containerfile index c41d2ccc..9289bbc9 100644 --- a/Containerfile +++ b/Containerfile @@ -68,6 +68,7 @@ COPY --from=common /system_files/bluefin /tmp/utah-bluefin COPY --from=brew /system_files /tmp/utah-brew COPY system_files/shared /tmp/utah-local +RUN mkdir -p /usr/local/libexec && \ for pair in install-packages.py:utah-install-packages \ verify-rpm-contract.py:utah-verify-rpm-contract \ build-gnome-extensions.sh:utah-build-gnome-extensions \