summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTomSweeneyRedHat <tsweeney@redhat.com>2019-02-21 15:38:58 -0500
committerTomSweeneyRedHat <tsweeney@redhat.com>2019-02-22 16:40:05 -0500
commitff0b4652efe4c502459d88fa6743168c6113244f (patch)
tree073484971fe2b943ab4ddde80d88420f2ac8603a /cmd
parent4d9f4cf71c79639da451a12a9e1d1d824bd15a9f (diff)
downloadpodman-ff0b4652efe4c502459d88fa6743168c6113244f.tar.gz
podman-ff0b4652efe4c502459d88fa6743168c6113244f.tar.bz2
podman-ff0b4652efe4c502459d88fa6743168c6113244f.zip
Vendor Buildah v1.7
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> Vendors in Buildah 1.7 into Podman. Also the latest imagebuilder and changes for `build --target` Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Diffstat (limited to 'cmd')
-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)
}