diff options
| author | TomSweeneyRedHat <tsweeney@redhat.com> | 2020-06-17 15:32:12 -0400 |
|---|---|---|
| committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2020-06-17 15:32:22 -0400 |
| commit | fde8040faabbaf6eac24a28a60631cd4b3337e91 (patch) | |
| tree | eed5fe6373c7c2d4d82672f521f52185121577e8 /vendor/github.com/openshift/imagebuilder/dispatchers.go | |
| parent | fd184fa4a1d0bd7797de1fb062c90e1a6d56bd1e (diff) | |
| download | podman-fde8040faabbaf6eac24a28a60631cd4b3337e91.tar.gz podman-fde8040faabbaf6eac24a28a60631cd4b3337e91.tar.bz2 podman-fde8040faabbaf6eac24a28a60631cd4b3337e91.zip | |
Bump Buildah to v1.15.0
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
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 } |