From 08d2f3ee1ff2145421de048069a0818d000f309f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nils=20m=C3=A5s=C3=A9n?= Date: Sat, 12 Aug 2023 21:10:39 +0200 Subject: [PATCH] fix go 1.18 compat --- pkg/session/image_meta.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/session/image_meta.go b/pkg/session/image_meta.go index 3d12a2a..0d9e8c5 100644 --- a/pkg/session/image_meta.go +++ b/pkg/session/image_meta.go @@ -4,11 +4,14 @@ import "strings" type imageMeta map[string]string +const openContainersPrefix = "org.opencontainers.image." + func imageMetaFromLabels(labels map[string]string) imageMeta { im := make(imageMeta) for key, value := range labels { - if suffix, found := strings.CutPrefix(key, "org.opencontainers.image."); found { - im[suffix] = value + if strings.HasPrefix(key, openContainersPrefix) { + strippedKey := key[len(openContainersPrefix):] + im[strippedKey] = value } } return im