Skip to content

Commit

Permalink
Feature/container signing (#4)
Browse files Browse the repository at this point in the history
* fix: enable ublue-nvctk-cdi by default for nvidia images (ublue-os#103)

* fix: run depmod after installing ZFS RPMs

With zfs 2.1.x, depmod ran automatically. Though unclear why, it no longer
seems to occur when installing zfs 2.2.x RPMs in a container build (it does
still work automatically on a non image-based Fedora system).

Manually running depmod, as in this commit, ensures the 2.2.x kmods load
as expected.

* docs: reflect zfs 2.2 change

* chore(deps): bump sigstore/cosign-installer from 3.2.0 to 3.3.0 (ublue-os#104)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: add package with secure boot public signing key

Add the new package from `ucore-kmods` which includes the signing key.
This enables a user to import the signing key as a MOK using:

sudo mokutil --import /etc/pki/akmods/certs/akmods-ublue.der

Closes ublue-os#82

* docs: add SecureBoot info to README

* docs: update SecureBoot to include zfs

Relates: ublue-os#16

* feat: enable signed images

These files should enable rpm-ostreed/container tooling to validate
signed images when using appropriate references. It will require signed
images for ghcr.io/ublue-os images.

Relates: ublue-os#101

* chore(ci): resume use of latest tag for stable image

I intentionally stopped publishing a `:latest` tag back on April 1st. It
was not intended to be an April Fool's joke, but rather a cleanup to
best practices of not using that tag. However, the old images did not
expire, so the old `:latest` continues to exist, confusing both users
and our website's image discovery code.

I suppose it turned out to be a long lived April Fool's joke after all!

This resumes the publishing of the tag, ensuring it matches the `:stable`
tag, and only on the `ucore` image. There will be no `:latest` for nvidia,
zfs or testing images, nor `fedora-coreos` or `ucore-hci`.

* chore(ci): bash variables only work when using proper braces

* chore(ci): move to reusable workflow (ublue-os#114)

Convert to a reusable workflow such that stable and testing builds can happen on separate schedules and so that stable builds are all that gate merge success, allowing testing to be more unstable.

* chore(ci): use Containerfile targets for ucore-hci (ublue-os#115)

This should allow faster overall builds of ucore and ucore-hci by building in parallel, and removes the need to publish ucore to GHCR even for PRs just to allow ucore-hci to build successfully.

* feat: adds bpbeatty signature rpm

* remove tailscale and nfs-utils

* debug: remove freeipa-client

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Benjamin Sherman <benjamin@holyarmy.org>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Jan 25, 2024
1 parent a2d56dc commit 121e499
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 106 deletions.
6 changes: 5 additions & 1 deletion ucore/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ RUN export IMAGE_NAME=ucore \
&& mkdir -p /tmp /var/tmp \
&& chmod -R 1777 /tmp /var/tmp

## bpbeatty signing files and keys
COPY --from=ghcr.io/bpbeatty/signing:latest /rpms /tmp/rpms
RUN rpm-ostree install /tmp/rpms/*.rpm

COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker-compose


Expand All @@ -52,4 +56,4 @@ RUN export IMAGE_NAME=ucore-hci \
&& ostree container commit \
&& mkdir -p /var/lib && mv /staged-alternatives /var/lib/alternatives \
&& mkdir -p /tmp /var/tmp \
&& chmod -R 1777 /tmp /var/tmp
&& chmod -R 1777 /tmp /var/tmp
5 changes: 2 additions & 3 deletions ucore/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"distrobox",
"duperemove",
"firewalld",
"freeipa-client",
"iwlegacy-firmware",
"iwlwifi-dvm-firmware",
"iwlwifi-mvm-firmware",
Expand All @@ -23,7 +22,6 @@
"podman-compose",
"qemu-guest-agent",
"snapraid",
"tailscale",
"tmux",
"vim",
"vim-default-editor",
Expand All @@ -42,7 +40,8 @@
},
"exclude": {
"all": [
"nano-default-editor"
"nano-default-editor",
"ublue-os-signing"
],
"ucore-hci": [
"nfs-utils-coreos"
Expand Down
95 changes: 0 additions & 95 deletions ucore/usr/etc/containers/policy.json

This file was deleted.

3 changes: 0 additions & 3 deletions ucore/usr/etc/containers/registries.d/ublue-os.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions ucore/usr/etc/pki/containers/ublue-os.pub

This file was deleted.

0 comments on commit 121e499

Please sign in to comment.