summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-20 10:56:06 +0100
committerGitHub <noreply@github.com>2020-02-20 10:56:06 +0100
commitc8436cd870e118a5e0dee6a130c6ea3dc6ceceeb (patch)
tree37b3f70b171588cb8af32eac294db763bc3eb2d9 /cmd/podman
parent846405256b38b11babf05de3a7666ceb81577a72 (diff)
parent96de762eedd1470dfbe73cf424eea848589268d7 (diff)
downloadpodman-c8436cd870e118a5e0dee6a130c6ea3dc6ceceeb.tar.gz
podman-c8436cd870e118a5e0dee6a130c6ea3dc6ceceeb.tar.bz2
podman-c8436cd870e118a5e0dee6a130c6ea3dc6ceceeb.zip
Merge pull request #5253 from rhatdan/buildah
Update to the latest version of buildah
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/build.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go
index 1fcb98a0e..12aedac37 100644
--- a/cmd/podman/build.go
+++ b/cmd/podman/build.go
@@ -84,7 +84,10 @@ func init() {
}
flag.DefValue = "true"
- fromAndBugFlags := buildahcli.GetFromAndBudFlags(&fromAndBudValues, &userNSValues, &namespaceValues)
+ fromAndBugFlags, err := buildahcli.GetFromAndBudFlags(&fromAndBudValues, &userNSValues, &namespaceValues)
+ if err != nil {
+ logrus.Errorf("failed to setup podman build flags: %v", err)
+ }
flags.AddFlagSet(&budFlags)
flags.AddFlagSet(&fromAndBugFlags)