mirror of
https://github.com/containers/podman.git
synced 2025-12-15 03:18:45 +08:00
Bump Buildah to v1.14.7
As the title says, bumping Buildah to v1.14.7 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
This commit is contained in:
3
vendor/github.com/containers/buildah/imagebuildah/build.go
generated
vendored
3
vendor/github.com/containers/buildah/imagebuildah/build.go
generated
vendored
@@ -3,7 +3,6 @@ package imagebuildah
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
@@ -323,7 +322,7 @@ func preprocessDockerfileContents(r io.Reader, ctxDir string) (rdrCloser *io.Rea
|
||||
pipe.Close()
|
||||
if err = cmd.Wait(); err != nil {
|
||||
if stderr.Len() > 0 {
|
||||
err = fmt.Errorf("%v: %s", err, strings.TrimSpace(stderr.String()))
|
||||
err = errors.Wrapf(err, "%v", strings.TrimSpace(stderr.String()))
|
||||
}
|
||||
return nil, errors.Wrapf(err, "error pre-processing Dockerfile")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user