From e668beef139ee094ad7364a5534b15d84b1b1f6d Mon Sep 17 00:00:00 2001 From: Han Verstraete Date: Wed, 2 Mar 2022 13:21:33 +0000 Subject: [PATCH] Normalize image name Provide consistency with how image names in function deployments are normalized. Signed-off-by: Han Verstraete --- pkg/supervisor.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/supervisor.go b/pkg/supervisor.go index 323c879..d1873b0 100644 --- a/pkg/supervisor.go +++ b/pkg/supervisor.go @@ -19,6 +19,7 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/oci" gocni "github.com/containerd/go-cni" + "github.com/docker/distribution/reference" "github.com/openfaas/faasd/pkg/cninetwork" "github.com/openfaas/faasd/pkg/service" "github.com/pkg/errors" @@ -107,7 +108,14 @@ func (s *Supervisor) Start(svcs []Service) error { for _, svc := range svcs { fmt.Printf("Preparing %s with image: %s\n", svc.Name, svc.Image) - img, err := service.PrepareImage(ctx, s.client, svc.Image, defaultSnapshotter, faasServicesPullAlways) + r, err := reference.ParseNormalizedNamed(svc.Image) + if err != nil { + return err + } + + imgRef := reference.TagNameOnly(r).String() + + img, err := service.PrepareImage(ctx, s.client, imgRef, defaultSnapshotter, faasServicesPullAlways) if err != nil { return err }