summaryrefslogtreecommitdiff
path: root/vendor/github.com/openshift/imagebuilder/evaluator.go
diff options
context:
space:
mode:
authorUrvashi Mohnani <umohnani@redhat.com>2018-11-20 20:07:17 +0000
committerUrvashi Mohnani <umohnani@redhat.com>2018-11-21 12:38:14 +0000
commitbd61c779caa6eed613d7e8595f0a6892bc8fa306 (patch)
tree81430b6b933c80a1d530a898115758c19cfc33fb /vendor/github.com/openshift/imagebuilder/evaluator.go
parentfe4f09493f41f675d24c969d1b60d1a6a45ddb9e (diff)
downloadpodman-bd61c779caa6eed613d7e8595f0a6892bc8fa306.tar.gz
podman-bd61c779caa6eed613d7e8595f0a6892bc8fa306.tar.bz2
podman-bd61c779caa6eed613d7e8595f0a6892bc8fa306.zip
Vendor in latest containers/buildah
Pulls in fix for COPY --from when using --layers Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
Diffstat (limited to 'vendor/github.com/openshift/imagebuilder/evaluator.go')
-rw-r--r--vendor/github.com/openshift/imagebuilder/evaluator.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/vendor/github.com/openshift/imagebuilder/evaluator.go b/vendor/github.com/openshift/imagebuilder/evaluator.go
index 83263127e..e1cd5d6d6 100644
--- a/vendor/github.com/openshift/imagebuilder/evaluator.go
+++ b/vendor/github.com/openshift/imagebuilder/evaluator.go
@@ -122,8 +122,7 @@ func (b *Step) Resolve(ast *parser.Node) error {
envs := b.Env
for ast.Next != nil {
ast = ast.Next
- var str string
- str = ast.Value
+ str := ast.Value
if replaceEnvAllowed[cmd] {
var err error
var words []string