diff --git a/Containerfile b/Containerfile index 53d0482304..4a2f18e03a 100644 --- a/Containerfile +++ b/Containerfile @@ -20,7 +20,6 @@ ARG RECIPE=recipe.yml # The default image registry to write to policy.json and cosign.yaml ARG IMAGE_REGISTRY=ghcr.io/ublue-os -RUN mkdir -p /usr/share/ublue-os COPY cosign.pub /usr/share/ublue-os/cosign.pub # Copy the bling from ublue-os/bling into tmp, to be installed later by the bling module diff --git a/config/recipe.yml b/config/recipe.yml index f745e3073b..fbbf7a6bcb 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -20,14 +20,14 @@ modules: # should be added into /usr/etc/ as that is the proper "distro" # config directory on ostree. Read more in the files module's README - - type: rpm-ostree - repos: - # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo - install: - - qemu-guest-agent - # - micro - #- starship - remove: +# - type: rpm-ostree +# repos: +# # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo +# install: +# - qemu-guest-agent +# # - micro +# #- starship +# remove: - type: bling # configure what to pull in from ublue-os/bling install: diff --git a/config/scripts/signing.sh b/config/scripts/signing.sh index 16b0ea853b..b733e69231 100644 --- a/config/scripts/signing.sh +++ b/config/scripts/signing.sh @@ -6,6 +6,7 @@ set -oue pipefail echo "Setting up container signing in policy.json and cosign.yaml for $IMAGE_NAME" echo "Registry to write: $IMAGE_REGISTRY" +mkdir -p /usr/etc/pki/containers cp /usr/share/ublue-os/cosign.pub /usr/etc/pki/containers/"$IMAGE_NAME".pub FILE=/usr/etc/containers/policy.json