Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
b- committed Oct 15, 2023
1 parent be7badc commit f4ea2b5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
1 change: 0 additions & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions config/recipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions config/scripts/signing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ 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

mkdir -p /usr/etc/containers
FILE=/usr/etc/containers/policy.json

yq -i -o=j '.transports.docker |=
Expand Down

0 comments on commit f4ea2b5

Please sign in to comment.