From e18e87c5807abc003c324d22c619bd77166213a9 Mon Sep 17 00:00:00 2001 From: "mergeraptor[bot]" <267480593+mergeraptor[bot]@users.noreply.github.com> Date: Sun, 6 Sep 2026 03:20:46 +0000 Subject: [PATCH 01/14] chore(deps): update quay.io/hummingbird-community/bootc-os:latest docker digest to 51fa61e --- Containerfile | 2 +- Containerfile.kernel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index fa5246d3..32c37550 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:51fa61e4fb5e571fb4b93afe7258145523e7c74a3b4cb1d9ba0ea5e499e7caaf # 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. diff --git a/Containerfile.kernel b/Containerfile.kernel index aa4d174f..c8afe5ae 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:51fa61e4fb5e571fb4b93afe7258145523e7c74a3b4cb1d9ba0ea5e499e7caaf FROM ${BASE_IMAGE} AS builder From 8acc83886a3b37f1304333bb7ccae28717c4d975 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Sun, 6 Sep 2026 02:41:12 -0400 Subject: [PATCH 02/14] 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 32c37550..b54acccb 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 7bbee1086d718af504ae22d8bf1e0fcb05fc2e21 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Sun, 6 Sep 2026 02:50:02 -0400 Subject: [PATCH 03/14] chore: certify CI fix under DCO Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: sec-check[bot] From 387d575c307197d3d2f825c137affa5738a9600c Mon Sep 17 00:00:00 2001 From: GitHub Copilot <223556219+Copilot@users.noreply.github.com> Date: Sun, 6 Sep 2026 06:44:31 -0400 Subject: [PATCH 04/14] 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 b54acccb..50249d94 100644 --- a/Containerfile +++ b/Containerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:51fa61e4fb5e # 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 ed3d841f8bf924ae41766492e494fe316d7c2b2e Mon Sep 17 00:00:00 2001 From: GitHub Copilot <223556219+Copilot@users.noreply.github.com> Date: Sun, 6 Sep 2026 14:40:07 -0400 Subject: [PATCH 05/14] 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 c8afe5ae..657e6246 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 e49994d9ecf91ca468f98fd0588c147a3f7f59bd Mon Sep 17 00:00:00 2001 From: Copilot <223556219+Copilot@users.noreply.github.com> Date: Sun, 6 Sep 2026 22:48:50 -0400 Subject: [PATCH 06/14] 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 50249d94..8948992c 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:51fa61e4fb5e571fb4b93afe7258145523e7c74a3b4cb1d9ba0ea5e499e7caaf +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 657e6246..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:51fa61e4fb5e571fb4b93afe7258145523e7c74a3b4cb1d9ba0ea5e499e7caaf +ARG BASE_IMAGE=quay.io/hummingbird-community/bootc-os:latest@sha256:4a3393125d2b0d9264f89a162659336b23d20c46ca9026ed7315d83d39a34293 FROM ${BASE_IMAGE} AS builder From 04054eafe7512f9f271979361db41c3a51bf74e3 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Mon, 7 Sep 2026 06:56:47 -0400 Subject: [PATCH 07/14] chore(ci): retrigger image builds after runner artifact failure Signed-off-by: sec-check[bot] From 95b4a9e7fb3a7a44cb81e16d81e819b0591e900b Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Mon, 7 Sep 2026 15:20:38 -0400 Subject: [PATCH 08/14] ci: retrigger failing image builds Signed-off-by: sec-check[bot] From b3e27cba7e188e79c7a7844efd0d7d8d230e1d1b 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:51 -0400 Subject: [PATCH 09/14] ci: rerun failing checks Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> From de1ef5a4a6b247f6aad529cfa5154f387039ea5d Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Wed, 9 Sep 2026 12:44:26 -0400 Subject: [PATCH 10/14] fix: skip unavailable service RPMs fwupd and tailscale are absent from enabled repositories, so exclude them from the install transaction while retaining optional unit configuration. Assisted-by: Claude Sonnet 5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: sec-check[bot] --- packages/utah.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/utah.toml b/packages/utah.toml index dbc79677..4da5da44 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 +# Neither service RPM is published by Hummingbird or utah-packages. +# 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 65d700716a46dfa368dd6cc2aa3334021330dd2e Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Wed, 9 Sep 2026 12:54:39 -0400 Subject: [PATCH 11/14] fix: keep image pins on matching Fedora release The updated bootc base reports Fedora 43 while the package repository digest was built for Fedora 44, causing broad package resolution failures. Restore the matching base and package repository pins. 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 +- packages/utah.toml | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Containerfile b/Containerfile index 8948992c..87afd1a5 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 diff --git a/packages/utah.toml b/packages/utah.toml index 4da5da44..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 -# Neither service RPM is published by Hummingbird or utah-packages. -# 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 ecfa03512ebb5d4f52261b3da0e24812e8609654 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Wed, 9 Sep 2026 20:34:51 -0400 Subject: [PATCH 12/14] 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 87afd1a5..0ec96b0e 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 991aa37d4a4dc308383ab602101608ca4533d078 Mon Sep 17 00:00:00 2001 From: "sec-check[bot]" Date: Thu, 10 Sep 2026 16:43:15 -0400 Subject: [PATCH 13/14] ci: retry transient failing checks Signed-off-by: sec-check[bot] From ef25a8d7a86229a10844269a416b463d3fdedb1f Mon Sep 17 00:00:00 2001 From: castrojo Date: Sun, 13 Sep 2026 19:10:39 -0400 Subject: [PATCH 14/14] fix: restore RUN instruction for libexec scripts installation --- Containerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Containerfile b/Containerfile index 0ec96b0e..bfbedbf8 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 install -d /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 \