particle-os/particle-os-modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: remove image-info handling from signing module

Browse source
This commit is contained in:
gerblesh 2024-03-21 14:47:32 -07:00
parent 2f304f0d71
commit 592b72fd93
2 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/signing/image-info.json
View file

@ -1,6 +0,0 @@
{
"image-ref": "IMAGE_REF",
"image-tag": "latest",
"image-vendor": "bluebuild",
"fedora-version": "FEDORA_MAJOR_VERSION"
}

8
modules/signing/signing.sh
View file

@ -25,15 +25,9 @@ if ! [ -f "$CONTAINER_DIR/policy.json" ]; then
cp "$MODULE_DIRECTORY/signing/policy.json" "$CONTAINER_DIR/policy.json"
fi
if ! [ -f "/usr/share/ublue-os/image-info.json" ]; then
cp "$MODULE_DIRECTORY/signing/image-info.json" "/usr/share/ublue-os/image-info.json"
fi
cp "/usr/share/ublue-os/cosign.pub" "/usr/etc/pki/containers/$IMAGE_NAME.pub"
POLICY_FILE="$CONTAINER_DIR/policy.json"
IMAGE_INFO="/usr/share/ublue-os/image-info.json"
yq -i -o=j '.transports.docker |=
{"'"$IMAGE_REGISTRY"'/'"$IMAGE_NAME"'": [
@ -49,8 +43,6 @@ yq -i -o=j '.transports.docker |=
+ .' "$POLICY_FILE"
IMAGE_REF="ostree-image-signed:docker://$IMAGE_REGISTRY/$IMAGE_NAME"
# Sets image-info.json used by ublue-update for auto-rebase workaround. Used by both bazzite and bluefin
yq -i -o=j '.image-ref="'"$IMAGE_REF"'" | .fedora-version="'"$OS_VERSION"'"' "$IMAGE_INFO"
mv "$MODULE_DIRECTORY/signing/registry-config.yaml" "$CONTAINER_DIR/registries.d/$IMAGE_NAME.yaml"
sed -i "s ghcr.io/IMAGENAME $IMAGE_REGISTRY g" "$CONTAINER_DIR/registries.d/$IMAGE_NAME.yaml"