bump containers/image to v5.0.0, buildah to v1.11.4

Move to containers/image v5 and containers/buildah to v1.11.4.

Replace an equality check with a type assertion when checking for a
docker.ErrUnauthorizedForCredentials in `podman login`.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

6 files changed, 18 insertions, 18 deletions

diff --git a/vendor/github.com/openshift/imagebuilder/OWNERS b/vendor/github.com/openshift/imagebuilder/OWNERS
index 6a900fd07..db859b7bd 100644
--- a/vendor/github.com/openshift/imagebuilder/OWNERS
+++ b/vendor/github.com/openshift/imagebuilder/OWNERS
@@ -1,5 +1,3 @@
-reviewers:
-- bparees
 approvers:
 - TomSweeneyRedHat
 - mrunalp
diff --git a/vendor/github.com/openshift/imagebuilder/README.md b/vendor/github.com/openshift/imagebuilder/README.md
index fd96ed940..772747bce 100644
--- a/vendor/github.com/openshift/imagebuilder/README.md
+++ b/vendor/github.com/openshift/imagebuilder/README.md
@@ -64,6 +64,11 @@ $ imagebuilder -f Dockerfile:Dockerfile.extra .
 will build the current directory and combine the first Dockerfile with the second. The FROM in the second image
 is ignored.
 
+Note that imagebuilder adds the built image to the `docker` daemon's internal storage. If you use `podman` you must first pull the image into its local registry:
+
+```
+$ podman pull docker-daemon:<IMAGE>:<TAG> # must contain either a tag or a digest
+```
 
 ## Code Example
 
diff --git a/vendor/github.com/openshift/imagebuilder/builder.go b/vendor/github.com/openshift/imagebuilder/builder.go
index 86b139b65..5a2d0d539 100644
--- a/vendor/github.com/openshift/imagebuilder/builder.go
+++ b/vendor/github.com/openshift/imagebuilder/builder.go
@@ -212,6 +212,7 @@ func NewStages(node *parser.Node, b *Builder) (Stages, error) {
 			Builder: &Builder{
 				Args:        b.Args,
 				AllowedArgs: b.AllowedArgs,
+				Env:         b.Env,
 			},
 			Node: root,
 		})
@@ -436,7 +437,7 @@ func (b *Builder) FromImage(image *docker.Image, node *parser.Node) error {
 	SplitChildren(node, command.From)
 
 	b.RunConfig = *image.Config
-	b.Env = b.RunConfig.Env
+	b.Env = append(b.Env, b.RunConfig.Env...)
 	b.RunConfig.Env = nil
 
 	// Check to see if we have a default PATH, note that windows won't
diff --git a/vendor/github.com/openshift/imagebuilder/constants.go b/vendor/github.com/openshift/imagebuilder/constants.go
index 86cd2e5e2..7b41e5a49 100644
--- a/vendor/github.com/openshift/imagebuilder/constants.go
+++ b/vendor/github.com/openshift/imagebuilder/constants.go
@@ -4,10 +4,6 @@ const (
 	// in docker/system
 	NoBaseImageSpecifier = "scratch"
 
-	// not yet part of our import
-	commandArg        = "arg"
-	commandStopSignal = "stopsignal"
-
 	// in docker/system
 	defaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 )
diff --git a/vendor/github.com/openshift/imagebuilder/evaluator.go b/vendor/github.com/openshift/imagebuilder/evaluator.go
index 1ea358451..1bbb25f2b 100644
--- a/vendor/github.com/openshift/imagebuilder/evaluator.go
+++ b/vendor/github.com/openshift/imagebuilder/evaluator.go
@@ -20,16 +20,16 @@ func ParseDockerfile(r io.Reader) (*parser.Node, error) {
 
 // Environment variable interpolation will happen on these statements only.
 var replaceEnvAllowed = map[string]bool{
-	command.Env:       true,
-	command.Label:     true,
-	command.Add:       true,
-	command.Copy:      true,
-	command.Workdir:   true,
-	command.Expose:    true,
-	command.Volume:    true,
-	command.User:      true,
-	commandStopSignal: true,
-	commandArg:        true,
+	command.Env:        true,
+	command.Label:      true,
+	command.Add:        true,
+	command.Copy:       true,
+	command.Workdir:    true,
+	command.Expose:     true,
+	command.Volume:     true,
+	command.User:       true,
+	command.StopSignal: true,
+	command.Arg:        true,
 }
 
 // Certain commands are allowed to have their args split into more
diff --git a/vendor/github.com/openshift/imagebuilder/vendor.conf b/vendor/github.com/openshift/imagebuilder/vendor.conf
index e437b79c3..c3f7d1a6b 100644
--- a/vendor/github.com/openshift/imagebuilder/vendor.conf
+++ b/vendor/github.com/openshift/imagebuilder/vendor.conf
@@ -5,7 +5,6 @@ github.com/docker/go-connections 97c2040d34dfae1d1b1275fa3a78dbdd2f41cf7e
 github.com/docker/go-units 2fb04c6466a548a03cb009c5569ee1ab1e35398e
 github.com/fsouza/go-dockerclient openshift-4.0 https://github.com/openshift/go-dockerclient.git
 github.com/gogo/protobuf c5a62797aee0054613cc578653a16c6237fef080
-github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998
 github.com/konsorten/go-windows-terminal-sequences f55edac94c9bbba5d6182a4be46d86a2c9b5b50e
 github.com/Microsoft/go-winio 1a8911d1ed007260465c3bfbbc785ac6915a0bb8
 github.com/Nvveen/Gotty cd527374f1e5bff4938207604a14f2e38a9cf512
@@ -18,3 +17,4 @@ github.com/sirupsen/logrus d7b6bf5e4d26448fd977d07d745a2a66097ddecb
 golang.org/x/crypto ff983b9c42bc9fbf91556e191cc8efb585c16908
 golang.org/x/net 45ffb0cd1ba084b73e26dee67e667e1be5acce83
 golang.org/x/sys 7fbe1cd0fcc20051e1fcb87fbabec4a1bacaaeba
+k8s.io/klog 8e90cee79f823779174776412c13478955131846