exporter: export ref name in oci tarball

Signed-off-by: Tonis Tiigi <[email protected]>

Author: tonistiigi

client/client_test.go

@@ -280,11 +280,13 @@ func testOCIExporter(t *testing.T, sb integration.Sandbox) {
 	defer os.RemoveAll(destDir)
 
 	out := filepath.Join(destDir, "out.tar")
+	target := "docker.io/buildkit/testoci:latest"
 
 	err = c.Solve(context.TODO(), def, SolveOpt{
 		Exporter: ExporterOCI,
 		ExporterAttrs: map[string]string{
 			"output": out,
+			"name":   target,
 		},
 	}, nil)
 	require.NoError(t, err)
@@ -308,6 +310,7 @@ func testOCIExporter(t *testing.T, sb integration.Sandbox) {
 	err = json.Unmarshal(m["blobs/sha256/"+index.Manifests[0].Digest.Hex()].data, &mfst)
 	require.NoError(t, err)
 	require.Equal(t, 2, len(mfst.Layers))
+	require.Equal(t, target, index.Manifests[0].Annotations["org.opencontainers.image.ref.name"])
 
 	var ociimg ocispec.Image
 	err = json.Unmarshal(m["blobs/sha256/"+mfst.Config.Digest.Hex()].data, &ociimg)

exporter/oci/export.go

@@ -11,12 +11,14 @@ import (
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/session/filesync"
 	"github.com/moby/buildkit/util/progress"
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 )
 
 const (
 	exporterImageConfig = "containerimage.config"
+	keyImageName        = "name"
 )
 
 type Opt struct {
@@ -52,6 +54,8 @@ func (e *imageExporter) Resolve(ctx context.Context, opt map[string]string) (exp
 		switch k {
 		case exporterImageConfig:
 			i.config = []byte(v)
+		case keyImageName:
+			i.name = v
 		default:
 			logrus.Warnf("oci exporter: unknown option %s", k)
 		}
@@ -63,6 +67,7 @@ type imageExporterInstance struct {
 	*imageExporter
 	config []byte
 	caller session.Caller
+	name   string
 }
 
 func (e *imageExporterInstance) Name() string {
@@ -77,6 +82,13 @@ func (e *imageExporterInstance) Export(ctx context.Context, ref cache.ImmutableR
 	if err != nil {
 		return err
 	}
+	if desc.Annotations == nil {
+		desc.Annotations = map[string]string{}
+	}
+	desc.Annotations[ocispec.AnnotationCreated] = time.Now().UTC().Format(time.RFC3339)
+	if e.name != "" {
+		desc.Annotations[ocispec.AnnotationRefName] = e.name
+	}
 
 	w, err := filesync.CopyFileWriter(ctx, e.caller)
 	if err != nil {