mirror of
https://github.com/containers/podman.git
synced 2025-09-24 15:25:41 +08:00
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>
This commit is contained in:
3
vendor/github.com/openshift/imagebuilder/builder.go
generated
vendored
3
vendor/github.com/openshift/imagebuilder/builder.go
generated
vendored
@ -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
|
||||
|
Reference in New Issue
Block a user