mirror of
https://github.com/containers/podman.git
synced 2025-12-06 13:56:22 +08:00
Vendor in latest buildah code
This will add --layers support. Also add missing information in man pages on podman build features. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #938 Approved by: umohnani8
This commit is contained in:
committed by
Atomic Bot
parent
95ea3d4f3a
commit
be217caa38
3
vendor/github.com/projectatomic/buildah/new.go
generated
vendored
3
vendor/github.com/projectatomic/buildah/new.go
generated
vendored
@@ -255,9 +255,11 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
|
||||
}
|
||||
image := options.FromImage
|
||||
imageID := ""
|
||||
topLayer := ""
|
||||
if img != nil {
|
||||
image = getImageName(imageNamePrefix(image), img)
|
||||
imageID = img.ID
|
||||
topLayer = img.TopLayer
|
||||
}
|
||||
if manifest, config, err = imageManifestAndConfig(ctx, ref, systemContext); err != nil {
|
||||
return nil, errors.Wrapf(err, "error reading data from image %q", transports.ImageName(ref))
|
||||
@@ -335,6 +337,7 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
|
||||
GIDMap: gidmap,
|
||||
},
|
||||
CommonBuildOpts: options.CommonBuildOpts,
|
||||
TopLayer: topLayer,
|
||||
}
|
||||
|
||||
if options.Mount {
|
||||
|
||||
Reference in New Issue
Block a user