enable OCI artifact for attestation manifest by default

README.md

@@ -284,7 +284,7 @@ Keys supported by image output:
 * `push-by-digest=true`: push unnamed image
 * `registry.insecure=true`: push to insecure HTTP registry
 * `oci-mediatypes=true`: use OCI mediatypes in configuration JSON instead of Docker's
-* `oci-artifact=false`: use OCI artifact format for attestations
+* `oci-artifact=true`: use OCI artifact format for attestations
 * `unpack=true`: unpack image after creation (for use with containerd)
 * `dangling-name-prefix=<value>`: name image with `prefix@<digest>`, used for anonymous images
 * `name-canonical=true`: add additional canonical name `name@<digest>`

client/client_test.go

@@ -1277,7 +1277,7 @@
 	require.NoError(t, err)
 
 	require.Equal(t, resp.ExporterResponse[exptypes.ExporterImageDigestKey], desc.Digest.String())
 	require.Equal(t, images.MediaTypeDockerSchema2Manifest, desc.MediaType)
 	require.Greater(t, desc.Size, int64(0))
 }
 
@@ -3821,7 +3821,7 @@
 		} else {
 			require.Len(t, ev.Record.Result.Results, 2)
 			require.Len(t, ev.Record.Exporters, 6)
 			require.Equal(t, images.MediaTypeDockerSchema2Manifest, ev.Record.Result.Results[0].MediaType)
 			require.Equal(t, ocispecs.MediaTypeImageManifest, ev.Record.Result.Results[1].MediaType)
 		}
 		require.Equal(t, ev.Record.Result.Results[0], ev.Record.Result.ResultDeprecated)
@@ -4810,7 +4810,7 @@
 				},
 			},
 		}, nil)
 		require.NoError(t, err)
 
 		ctx := namespaces.WithNamespace(sb.Context(), "buildkit")
 
@@ -4871,7 +4871,7 @@
 		require.NoError(t, err)
 
 		require.Equal(t, 2, len(mfst.Layers))
 		require.Equal(t, images.MediaTypeDockerSchema2Layer, mfst.Layers[0].MediaType)
 		require.Len(t, mfst.Layers[0].URLs, 0)
 		require.Equal(t, images.MediaTypeDockerSchema2Layer, mfst.Layers[1].MediaType)
 
@@ -4938,7 +4938,7 @@
 		mfst, err := images.Manifest(ctx, client.ContentStore(), img.Target(), nil)
 		require.NoError(t, err)
 		require.Equal(t, 1, len(mfst.Layers))
-		require.Equal(t, images.MediaTypeDockerSchema2Layer, mfst.Layers[0].MediaType)
+		require.Equal(t, ocispecs.MediaTypeImageLayer, mfst.Layers[0].MediaType)
 	}
 
 	// new layer with gzip compression
@@ -5007,7 +5007,7 @@
 	err = json.Unmarshal(dt, &mfst)
 	require.NoError(t, err)
 	require.Equal(t, 2, len(mfst.Layers))
 	require.Equal(t, images.MediaTypeDockerSchema2Layer, mfst.Layers[0].MediaType)
 	require.Equal(t, images.MediaTypeDockerSchema2LayerGzip, mfst.Layers[1].MediaType)
 
 	dt, err = content.ReadBlob(ctx, img.ContentStore(), ocispecs.Descriptor{Digest: mfst.Layers[0].Digest})
@@ -5170,7 +5170,7 @@
 	require.NoError(t, err)
 
 	lastLayer = mfst.Layers[len(mfst.Layers)-1]
 	require.Equal(t, images.MediaTypeDockerSchema2Layer+".zstd", lastLayer.MediaType)
 
 	require.Equal(t, lastLayer.Digest.Hex(), zstdLayerDigest)
 }
@@ -5259,7 +5259,7 @@
 			if ociMediaTypes {
 				require.Equal(t, ocispecs.MediaTypeImageLayer+"+zstd", firstLayer.MediaType)
 			} else {
 				require.Equal(t, images.MediaTypeDockerSchema2Layer+".zstd", firstLayer.MediaType)
 			}
 
 			zstdLayerDigest := firstLayer.Digest.Hex()
@@ -5414,10 +5414,10 @@
 	err = json.Unmarshal(dt, &mfst)
 	require.NoError(t, err)
 
-	require.Equal(t, images.MediaTypeDockerSchema2Manifest, mfst.MediaType)
+	require.Equal(t, ocispecs.MediaTypeImageManifest, mfst.MediaType)
 	require.Equal(t, 3, len(mfst.Layers))
-	require.Equal(t, images.MediaTypeDockerSchema2LayerGzip, mfst.Layers[0].MediaType)
-	require.Equal(t, images.MediaTypeDockerSchema2LayerGzip, mfst.Layers[1].MediaType)
+	require.Equal(t, ocispecs.MediaTypeImageLayerGzip, mfst.Layers[0].MediaType)
+	require.Equal(t, ocispecs.MediaTypeImageLayerGzip, mfst.Layers[1].MediaType)
 
 	dt, err = content.ReadBlob(ctx, img.ContentStore(), ocispecs.Descriptor{Digest: mfst.Layers[0].Digest})
 	require.NoError(t, err)
@@ -9710,7 +9710,7 @@
 	require.Equal(t, "b", imgs.Images[0].Manifest.Annotations["a"])
 	require.Equal(t, "d", imgs2.Index.Annotations["c"])
 
 	require.Equal(t, images.MediaTypeDockerSchema2ManifestList, imgs.Index.MediaType)
 	require.Equal(t, ocispecs.MediaTypeImageIndex, imgs2.Index.MediaType)
 }
 

exporter/containerimage/export.go

@@ -77,6 +77,7 @@ func (e *imageExporter) Resolve(ctx context.Context, id int, opt map[string]stri
 			RefCfg: cacheconfig.RefConfig{
 				Compression: compression.New(compression.Default),
 			},
+			OCIArtifact:             true,
 			ForceInlineAttestations: true,
 		},
 		store: true,

exporter/oci/export.go

@@ -70,7 +70,8 @@ func (e *imageExporter) Resolve(ctx context.Context, id int, opt map[string]stri
 			RefCfg: cacheconfig.RefConfig{
 				Compression: compression.New(compression.Default),
 			},
-			OCITypes: e.opt.Variant == VariantOCI,
+			OCIArtifact: true,
+			OCITypes:    e.opt.Variant == VariantOCI,
 		},
 	}