opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-08 14:48:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2401 from TomSweeneyRedHat/dev/tsweeney/buildah1.7

Browse Source 
Vendor Buildah v1.7
This commit is contained in:
OpenShift Merge Robot
2019-02-22 23:56:06 +01:00
committed by GitHub
parent c00bf28f24 ff0b4652ef
commit b223d4e136
17 changed files with 333 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/build.go
View File

@@ -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)
}