enable OCI artifact for attestation manifest by default

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

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

@@ -4938,7 +4938,7 @@ func testBuildExportWithUncompressed(t *testing.T, sb integration.Sandbox) {
 		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
@@ -5414,10 +5414,10 @@ func testBuildPushAndValidate(t *testing.T, sb integration.Sandbox) {
 	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)

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,
 		},
 	}