Merge pull request #4647 from tonistiigi/sourceresolver-fallback

add missing fallback from new frontend to daemon without sourceresolver
moby · Feb 14, 2024 · f1bd3af · f1bd3af
2 parents 47d6583 + 0184fde
commit f1bd3af
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile-upstream:master
+# syntax=docker/dockerfile-upstream:master@sha256:cd94315a37d63ca11498df06c59883d86fa5b662b0fe5dfee7ad5b7086e95fdf
 
 ARG RUNC_VERSION=v1.1.12
 ARG CONTAINERD_VERSION=v1.7.11

diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile-upstream:master
+# syntax=docker/dockerfile-upstream:master@sha256:cd94315a37d63ca11498df06c59883d86fa5b662b0fe5dfee7ad5b7086e95fdf
 
 ARG GO_VERSION=1.21
 

diff --git a/frontend/gateway/grpcclient/client.go b/frontend/gateway/grpcclient/client.go
@@ -484,7 +484,31 @@ func (c *grpcClient) Solve(ctx context.Context, creq client.SolveRequest) (res *
 
 func (c *grpcClient) ResolveSourceMetadata(ctx context.Context, op *opspb.SourceOp, opt sourceresolver.Opt) (*sourceresolver.MetaResponse, error) {
 	if c.caps.Supports(pb.CapSourceMetaResolver) != nil {
-		return nil, errors.Errorf("fallback not implemented")
+		var ref string
+		if v, ok := strings.CutPrefix(op.Identifier, "docker-image://"); ok {
+			ref = v
+		} else if v, ok := strings.CutPrefix(op.Identifier, "oci-layout://"); ok {
+			ref = v
+		} else {
+			return &sourceresolver.MetaResponse{Op: op}, nil
+		}
+		retRef, dgst, config, err := c.ResolveImageConfig(ctx, ref, opt)
+		if err != nil {
+			return nil, err
+		}
+		if strings.HasPrefix(op.Identifier, "docker-image://") {
+			op.Identifier = "docker-image://" + retRef
+		} else if strings.HasPrefix(op.Identifier, "oci-layout://") {
+			op.Identifier = "oci-layout://" + retRef
+		}
+
+		return &sourceresolver.MetaResponse{
+			Op: op,
+			Image: &sourceresolver.ResolveImageResponse{
+				Digest: dgst,
+				Config: config,
+			},
+		}, nil
 	}
 
 	var p *opspb.Platform