summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-22 23:56:06 +0100
committerGitHub <noreply@github.com>2019-02-22 23:56:06 +0100
commitb223d4e1367463a32eeeb31a4b9d8a351641d83c (patch)
tree285e2471a320bf7f0d00101b2e7d12fec2dab496 /cmd/podman
parentc00bf28f24e2eed435c156cd1aabe59c10fe9824 (diff)
parentff0b4652efe4c502459d88fa6743168c6113244f (diff)
downloadpodman-b223d4e1367463a32eeeb31a4b9d8a351641d83c.tar.gz
podman-b223d4e1367463a32eeeb31a4b9d8a351641d83c.tar.bz2
podman-b223d4e1367463a32eeeb31a4b9d8a351641d83c.zip
Merge pull request #2401 from TomSweeneyRedHat/dev/tsweeney/buildah1.7
Vendor Buildah v1.7
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/build.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go
index bb252f171..2054381ec 100644
--- a/cmd/podman/build.go
+++ b/cmd/podman/build.go
@@ -179,7 +179,7 @@ func buildCmd(c *cliconfig.BuildValues) error {
}
runtimeFlags := []string{}
- for _, arg := range c.RuntimeOpts {
+ for _, arg := range c.RuntimeFlags {
runtimeFlags = append(runtimeFlags, "--"+arg)
}
// end from buildah
@@ -258,6 +258,7 @@ func buildCmd(c *cliconfig.BuildValues) error {
RuntimeArgs: runtimeFlags,
SignaturePolicyPath: c.SignaturePolicy,
Squash: c.Squash,
+ Target: c.Target,
}
return runtime.Build(getContext(), c, options, dockerfiles)
}