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

Bump Buildah to v1.15.0

Browse Source 
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
This commit is contained in:
TomSweeneyRedHat
2020-06-17 15:32:12 -04:00
parent fd184fa4a1
commit fde8040faa
13 changed files with 258 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/github.com/openshift/imagebuilder/dispatchers.go generated vendored
View File

@ -153,8 +153,9 @@ func add(b *Builder, args []string, attributes map[string]bool, flagArgs []strin
var chown string
last := len(args) - 1
dest := makeAbsolute(args[last], b.RunConfig.WorkingDir)
userArgs := makeUserArgs(b.Env, b.Args)
for _, a := range flagArgs {
arg, err := ProcessWord(a, b.Env)
arg, err := ProcessWord(a, userArgs)
if err != nil {
return err
}
@ -181,8 +182,9 @@ func dispatchCopy(b *Builder, args []string, attributes map[string]bool, flagArg
dest := makeAbsolute(args[last], b.RunConfig.WorkingDir)
var chown string
var from string
userArgs := makeUserArgs(b.Env, b.Args)
for _, a := range flagArgs {
arg, err := ProcessWord(a, b.Env)
arg, err := ProcessWord(a, userArgs)
if err != nil {
return err
}