InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50036 from thaJeztah/buildkit_rm_schema1

Browse Source 
builder-next: remove support for deprecated schema1 images
This commit is contained in:
Sebastiaan van Stijn
2025-05-21 23:44:12 +02:00
committed by GitHub
parent 7148c6a5f5 e8c269843c
commit b3160e88bf
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
builder/builder-next/adapters/containerimage/pull.go
View File

@@ -19,7 +19,6 @@ import (
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/core/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019: "github.com/containerd/containerd/remotes/docker/schema1" is deprecated: use images formatted in Docker Image Manifest v2, Schema 2, or OCI Image Spec v1.
"github.com/containerd/containerd/v2/pkg/gc"
c8dreference "github.com/containerd/containerd/v2/pkg/reference"
cerrdefs "github.com/containerd/errdefs"
@@ -518,18 +517,13 @@ func (p *puller) Snapshot(ctx context.Context, g session.Group) (cache.Immutable
var nonLayers []digest.Digest
var (
schema1Converter *schema1.Converter
handlers []c8dimages.Handler
)
var handlers []c8dimages.Handler
if p.desc.MediaType == c8dimages.MediaTypeDockerSchema1Manifest {
schema1Converter, err = schema1.NewConverter(p.is.ContentStore, fetcher)
if err != nil {
stopProgress()
return nil, err
}
handlers = append(handlers, schema1Converter)
stopProgress()
// similar to [github.com/docker/docker/distribution/DeprecatedSchema1ImageError]
errMsg := "support for Docker Image Format v1 and Docker Image manifest version 2, schema 1 has been removed in Docker Engine v28.2. " +
"More information at https://docs.docker.com/go/deprecated-image-specs/"
return nil, cerrdefs.ErrInvalidArgument.WithMessage(errMsg)
// TODO: Optimize to do dispatch and integrate pulling with download manager,
// leverage existing blob mapping and layer storage
} else {
@@ -568,13 +562,6 @@ func (p *puller) Snapshot(ctx context.Context, g session.Group) (cache.Immutable
}
defer stopProgress()
if schema1Converter != nil {
p.desc, err = schema1Converter.Convert(ctx)
if err != nil {
return nil, err
}
}
mfst, err := c8dimages.Manifest(ctx, p.is.ContentStore, p.desc, platform)
if err != nil {
return nil, err