Merge pull request #2549 from tonistiigi/img-name-fix

dockerfile: fix image name when loaded named context
This commit is contained in:
Tõnis Tiigi
2022-01-07 12:17:44 -08:00
committed by GitHub

View File

@@ -839,14 +839,15 @@ func contextByName(ctx context.Context, c client.Client, name string, platform *
}
switch vv[0] {
case "docker-image":
ref := strings.TrimPrefix(vv[1], "//")
imgOpt := []llb.ImageOption{
llb.WithCustomName("[context " + name + "] " + vv[1]),
llb.WithCustomName("[context " + name + "] " + ref),
llb.WithMetaResolver(c),
}
if platform != nil {
imgOpt = append(imgOpt, llb.Platform(*platform))
}
st := llb.Image(strings.TrimPrefix(vv[1], "//"), imgOpt...)
st := llb.Image(ref, imgOpt...)
return &st, nil, nil
case "git":
st, ok := detectGitContext(v, "1")