mirror of
https://github.com/containers/podman.git
synced 2025-12-01 02:27:13 +08:00
Bump Buidah to v1.42.0 for Podman v5.7
Vendor Buildah v1.42.0 into Podman for v5.7.0. This will also drag in: go.podman.io/common v0.66.0 go.podman.io/image v5.38.0 go.podman.io/storage v1.61.0 Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
10
vendor/github.com/containers/buildah/commit.go
generated
vendored
10
vendor/github.com/containers/buildah/commit.go
generated
vendored
@@ -531,6 +531,16 @@ func (b *Builder) Commit(ctx context.Context, dest types.ImageReference, options
|
||||
if err != nil {
|
||||
return imgID, nil, "", fmt.Errorf("computing digest of manifest of new image %q: %w", transports.ImageName(dest), err)
|
||||
}
|
||||
if imgID == "" {
|
||||
parsedManifest, err := manifest.FromBlob(manifestBytes, manifest.GuessMIMEType(manifestBytes))
|
||||
if err != nil {
|
||||
return imgID, nil, "", fmt.Errorf("parsing written manifest to determine the image's ID: %w", err)
|
||||
}
|
||||
configInfo := parsedManifest.ConfigInfo()
|
||||
if configInfo.Size > 2 && configInfo.Digest.Validate() == nil { // don't be returning a digest of "" or "{}"
|
||||
imgID = configInfo.Digest.Encoded()
|
||||
}
|
||||
}
|
||||
|
||||
var ref reference.Canonical
|
||||
if name := dest.DockerReference(); name != nil {
|
||||
|
||||
Reference in New Issue
Block a user