mirror of
https://github.com/containers/podman.git
synced 2025-12-08 14:48:48 +08:00
Bump to Buildah v1.11.5
Bump to Buildah v1.11.5. Most notably changes to the podman build `--pull` functionality. `--pull=true` and `--pull=false` now work as Docker does, `--pull-never` added to supply the functionality of the old `--pull=false`. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
This commit is contained in:
9
vendor/github.com/containers/buildah/imagebuildah/executor.go
generated
vendored
9
vendor/github.com/containers/buildah/imagebuildah/executor.go
generated
vendored
@@ -339,6 +339,11 @@ func (b *Executor) Build(ctx context.Context, stages imagebuilder.Stages) (image
|
||||
var cleanupImages []string
|
||||
cleanupStages := make(map[int]*StageExecutor)
|
||||
|
||||
stdout := b.out
|
||||
if b.quiet {
|
||||
b.out = ioutil.Discard
|
||||
}
|
||||
|
||||
cleanup := func() error {
|
||||
var lastErr error
|
||||
// Clean up any containers associated with the final container
|
||||
@@ -527,6 +532,10 @@ func (b *Executor) Build(ctx context.Context, stages imagebuilder.Stages) (image
|
||||
if err = ioutil.WriteFile(b.iidfile, []byte(imageID), 0644); err != nil {
|
||||
return imageID, ref, errors.Wrapf(err, "failed to write image ID to file %q", b.iidfile)
|
||||
}
|
||||
} else {
|
||||
if _, err := stdout.Write([]byte(imageID + "\n")); err != nil {
|
||||
return imageID, ref, errors.Wrapf(err, "failed to write image ID to stdout")
|
||||
}
|
||||
}
|
||||
|
||||
return imageID, ref, nil
|
||||
|
||||
Reference in New Issue
Block a user