mirror of
https://github.com/containers/podman.git
synced 2025-12-08 23:00:23 +08:00
Vendor in latest containers/buildah code
This should improve the speed of podman build. Has fixes from containres/image for parallell pull. Also vendor containers/storage and containers/image Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
7
vendor/github.com/containers/buildah/imagebuildah/build.go
generated
vendored
7
vendor/github.com/containers/buildah/imagebuildah/build.go
generated
vendored
@@ -1307,7 +1307,12 @@ func (b *Executor) Build(ctx context.Context, stages imagebuilder.Stages) (strin
|
||||
|
||||
var imageRef reference.Canonical
|
||||
imageID := ""
|
||||
if !b.layers && !b.noCache {
|
||||
|
||||
// Check if we have a one line Dockerfile making layers irrelevant
|
||||
// or the user told us to ignore layers.
|
||||
ignoreLayers := (len(stages) < 2 && len(stages[0].Node.Children) < 2) || (!b.layers && !b.noCache)
|
||||
|
||||
if ignoreLayers {
|
||||
imgID, ref, err := stageExecutor.Commit(ctx, stages[len(stages)-1].Builder, "")
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
|
||||
5
vendor/github.com/containers/buildah/imagebuildah/chroot_symlink.go
generated
vendored
5
vendor/github.com/containers/buildah/imagebuildah/chroot_symlink.go
generated
vendored
@@ -131,6 +131,11 @@ func resolveModifiedTime(rootdir, filename, historyTime string) (bool, error) {
|
||||
func modTimeIsGreater(rootdir, path string, historyTime string) (bool, error) {
|
||||
var timeIsGreater bool
|
||||
|
||||
// the Walk below doesn't work if rootdir and path are equal
|
||||
if rootdir == path {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
// Convert historyTime from string to time.Time for comparison
|
||||
histTime, err := time.Parse(time.RFC3339Nano, historyTime)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user