docker-library
/
bashbrew
mirror of https://github.com/docker-library/bashbrew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix edge case with previously (failed) ingested content

This commit is contained in:
Tianon Gravi 2022-12-06 10:14:34 -08:00
parent 0b7ae64b2f
commit b96445ff59
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/bashbrew/oci-builder.go
View File

@ -62,7 +62,7 @@ func readContentJSON(ctx context.Context, cs content.Provider, desc imagespec.De
}
// given a containerd content store, an io/fs reference to an "OCI image layout", and an OCI descriptor, import the given blob into the content store (with appropriate validation)
func importOCIBlob(ctx context.Context, cs content.Ingester, fs iofs.FS, descriptor imagespec.Descriptor) error {
func importOCIBlob(ctx context.Context, cs content.Store, fs iofs.FS, descriptor imagespec.Descriptor) error {
// https://github.com/opencontainers/image-spec/blob/v1.0.2/image-layout.md#blobs
blob, err := fs.Open(path.Join("blobs", string(descriptor.Digest.Algorithm()), descriptor.Digest.Encoded())) // "blobs/sha256/deadbeefdeadbeefdeadbeef..."
if err != nil {
@ -70,6 +70,11 @@ func importOCIBlob(ctx context.Context, cs content.Ingester, fs iofs.FS, descrip
}
defer blob.Close()
ingestRef := string(descriptor.Digest)
// explicitly "abort" the ref we're about to use in case there's a partial or failed ingest already (which content.WriteBlob will then quietly reuse, over and over)
_ = cs.Abort(ctx, ingestRef)
// WriteBlob does *not* limit reads to the provided size, so let's wrap ourselves in a LimitedReader to prevent reading (much) more than we intend
r := io.LimitReader(
blob,
@ -77,7 +82,7 @@ func importOCIBlob(ctx context.Context, cs content.Ingester, fs iofs.FS, descrip
)
// WriteBlob verifies the digest and the size while ingesting
return content.WriteBlob(ctx, cs, string(descriptor.Digest), r, descriptor)
return content.WriteBlob(ctx, cs, ingestRef, r, descriptor)
}
// this is "docker build" but for "Builder: oci-import"