Merge branch 'main' into feat/276/docker-loadable

hauler-dev · Sep 18, 2024 · bb264b9 · bb264b9
2 parents 562b074 + 01eebd5
commit bb264b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -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

diff --git a/Makefile b/Makefile
@@ -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

diff --git a/cmd/hauler/cli/store/info.go b/cmd/hauler/cli/store/info.go
@@ -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{}
 	}