diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-17 16:43:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 16:43:06 -0400 |
| commit | 7b5073b46e4ba3914ce526fa60ef91346f50f577 (patch) | |
| tree | b731cc3ed3b7c407a23ea2235e65eb429925d9c7 /vendor/github.com/openshift/imagebuilder/dispatchers.go | |
| parent | a76bf114d1a408cb3bbcd3c642805d1bf13b07c0 (diff) | |
| parent | fde8040faabbaf6eac24a28a60631cd4b3337e91 (diff) | |
| download | podman-7b5073b46e4ba3914ce526fa60ef91346f50f577.tar.gz podman-7b5073b46e4ba3914ce526fa60ef91346f50f577.tar.bz2 podman-7b5073b46e4ba3914ce526fa60ef91346f50f577.zip | |
Merge pull request #6655 from TomSweeneyRedHat/dev/tsweeney/b1_15_0
Bump Buildah to v1.15.0
Diffstat (limited to 'vendor/github.com/openshift/imagebuilder/dispatchers.go')
| -rw-r--r-- | vendor/github.com/openshift/imagebuilder/dispatchers.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vendor/github.com/openshift/imagebuilder/dispatchers.go b/vendor/github.com/openshift/imagebuilder/dispatchers.go index 1d77a193b..3a350fbee 100644 --- a/vendor/github.com/openshift/imagebuilder/dispatchers.go +++ b/vendor/github.com/openshift/imagebuilder/dispatchers.go @@ -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 } |