Skip to content

Commit

Permalink
bump to cosign v2.2.3-carbide.3 for new annotation (#322)
Browse files Browse the repository at this point in the history
* bump cosign to v2.2.3-carbide.3
* use new annotation in 'store info' when listing images

Signed-off-by: Adam Martin <adam.martin@ranchergovernment.com>

---------

Signed-off-by: Adam Martin <adam.martin@ranchergovernment.com>
  • Loading branch information
amartin120 authored Sep 18, 2024
1 parent 5aa55e9 commit 01eebd5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ release:

env:
- vpkg=hauler.dev/go/hauler/internal/version
- cosign_version=v2.2.3+carbide.2
- cosign_version=v2.2.3+carbide.3

builds:
- main: cmd/hauler/main.go
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GO_FILES=$(shell go list ./... | grep -v /vendor/)
GO_COVERPROFILE=coverage.out

# set cosign variables
COSIGN_VERSION=v2.2.3+carbide.2
COSIGN_VERSION=v2.2.3+carbide.3

# set build variables
BIN_DIRECTORY=bin
Expand Down
6 changes: 5 additions & 1 deletion cmd/hauler/cli/store/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,11 @@ func newItem(s *store.Layout, desc ocispec.Descriptor, m ocispec.Manifest, plat
ctype = "sbom"
}

ref, err := reference.Parse(desc.Annotations[ocispec.AnnotationRefName])
refName := desc.Annotations["io.containerd.image.name"]
if refName == "" {
refName = desc.Annotations[ocispec.AnnotationRefName]
}
ref, err := reference.Parse(refName)
if err != nil {
return item{}
}
Expand Down

0 comments on commit 01eebd5

Please sign in to comment.