faas-rs/faasd
1
0
Fork 0
mirror of https://github.com/openfaas/faasd.git synced 2025-06-12 18:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

deploy: use reference.ParseNormalizedNamed()

Browse Source 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2020-02-09 20:48:36 +09:00 committed by Alex Ellis
parent 2454c2a807
commit e07186ed5b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/provider/handlers/deploy.go
View File

@ -9,17 +9,17 @@ import (
"net/http" "net/http"
"os" "os"
"path" "path"
"strings"
cninetwork "github.com/openfaas/faasd/pkg/cninetwork"
"github.com/openfaas/faasd/pkg/service"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/cio" "github.com/containerd/containerd/cio"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci" "github.com/containerd/containerd/oci"
gocni "github.com/containerd/go-cni" gocni "github.com/containerd/go-cni"
"github.com/docker/distribution/reference"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/openfaas/faas-provider/types" "github.com/openfaas/faas-provider/types"
cninetwork "github.com/openfaas/faasd/pkg/cninetwork"
"github.com/openfaas/faasd/pkg/service"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -64,11 +64,11 @@ func MakeDeployHandler(client *containerd.Client, cni gocni.CNI, secretMountPath
} }
func deploy(ctx context.Context, req types.FunctionDeployment, client *containerd.Client, cni gocni.CNI, secretMountPath string) error { func deploy(ctx context.Context, req types.FunctionDeployment, client *containerd.Client, cni gocni.CNI, secretMountPath string) error {
r, err := reference.ParseNormalizedNamed(req.Image)
imgRef := "docker.io/" + req.Image if err != nil {
if strings.Index(req.Image, ":") == -1 { return err
imgRef = imgRef + ":latest"
} }
imgRef := reference.TagNameOnly(r).String()
snapshotter := "" snapshotter := ""
if val, ok := os.LookupEnv("snapshotter"); ok { if val, ok := os.LookupEnv("snapshotter"); ok {