mirror of
https://github.com/containers/podman.git
synced 2025-11-02 23:39:52 +08:00
Bump Buildah to v1.35.0
As the title says. This is the last step in the vendor dance for Podman v5.0. [NO NEW TESTS NEEDED] Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
4
vendor/github.com/containers/common/libimage/copier.go
generated
vendored
4
vendor/github.com/containers/common/libimage/copier.go
generated
vendored
@ -432,12 +432,12 @@ func (c *copier) copy(ctx context.Context, source, destination types.ImageRefere
|
||||
// Sanity checks for Buildah.
|
||||
if sourceInsecure != nil && *sourceInsecure {
|
||||
if c.systemContext.DockerInsecureSkipTLSVerify == types.OptionalBoolFalse {
|
||||
return nil, fmt.Errorf("can't require tls verification on an insecured registry")
|
||||
return nil, errors.New("can't require tls verification on an insecured registry")
|
||||
}
|
||||
}
|
||||
if destinationInsecure != nil && *destinationInsecure {
|
||||
if c.systemContext.DockerInsecureSkipTLSVerify == types.OptionalBoolFalse {
|
||||
return nil, fmt.Errorf("can't require tls verification on an insecured registry")
|
||||
return nil, errors.New("can't require tls verification on an insecured registry")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
3
vendor/github.com/containers/common/libimage/filters.go
generated
vendored
3
vendor/github.com/containers/common/libimage/filters.go
generated
vendored
@ -4,6 +4,7 @@ package libimage
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"path"
|
||||
"strconv"
|
||||
@ -226,7 +227,7 @@ func (r *Runtime) containers(duplicate map[string]string, key, value string, ext
|
||||
case "false", "true":
|
||||
case "external":
|
||||
if externalFunc == nil {
|
||||
return fmt.Errorf("libimage error: external containers filter without callback")
|
||||
return errors.New("libimage error: external containers filter without callback")
|
||||
}
|
||||
default:
|
||||
return fmt.Errorf("unsupported value %q for containers filter", value)
|
||||
|
||||
3
vendor/github.com/containers/common/libimage/load.go
generated
vendored
3
vendor/github.com/containers/common/libimage/load.go
generated
vendored
@ -4,6 +4,7 @@ package libimage
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"time"
|
||||
@ -91,7 +92,7 @@ func (r *Runtime) Load(ctx context.Context, path string, options *LoadOptions) (
|
||||
// Give a decent error message if nothing above worked.
|
||||
// we want the colon here for the multiline error
|
||||
//nolint:revive
|
||||
loadError := fmt.Errorf("payload does not match any of the supported image formats:")
|
||||
loadError := errors.New("payload does not match any of the supported image formats:")
|
||||
for _, err := range loadErrors {
|
||||
loadError = fmt.Errorf("%v\n * %v", loadError, err)
|
||||
}
|
||||
|
||||
2
vendor/github.com/containers/common/libimage/manifests/manifests.go
generated
vendored
2
vendor/github.com/containers/common/libimage/manifests/manifests.go
generated
vendored
@ -834,7 +834,7 @@ func (l *list) AddArtifact(ctx context.Context, sys *types.SystemContext, option
|
||||
if configDescriptor.Size != 0 {
|
||||
if len(configDescriptor.Data) == 0 {
|
||||
if options.ConfigFile == "" {
|
||||
return "", fmt.Errorf("needed config data file, but none was provided")
|
||||
return "", errors.New("needed config data file, but none was provided")
|
||||
}
|
||||
filePath, err := filepath.Abs(options.ConfigFile)
|
||||
if err != nil {
|
||||
|
||||
4
vendor/github.com/containers/common/libimage/pull.go
generated
vendored
4
vendor/github.com/containers/common/libimage/pull.go
generated
vendored
@ -426,7 +426,7 @@ func (r *Runtime) copyFromRegistry(ctx context.Context, ref types.ImageReference
|
||||
for _, tag := range tags {
|
||||
select { // Let's be gentle with Podman remote.
|
||||
case <-ctx.Done():
|
||||
return nil, fmt.Errorf("pulling cancelled")
|
||||
return nil, errors.New("pulling cancelled")
|
||||
default:
|
||||
// We can continue.
|
||||
}
|
||||
@ -466,7 +466,7 @@ func (r *Runtime) imagesIDsForManifest(manifestBytes []byte, sys *types.SystemCo
|
||||
} else {
|
||||
d, err := manifest.Digest(manifestBytes)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("digesting manifest")
|
||||
return nil, errors.New("digesting manifest")
|
||||
}
|
||||
imageDigest = d
|
||||
}
|
||||
|
||||
2
vendor/github.com/containers/common/libimage/runtime.go
generated
vendored
2
vendor/github.com/containers/common/libimage/runtime.go
generated
vendored
@ -690,7 +690,7 @@ func (r *Runtime) RemoveImages(ctx context.Context, names []string, options *Rem
|
||||
}
|
||||
|
||||
if options.ExternalContainers && options.IsExternalContainerFunc == nil {
|
||||
return nil, []error{fmt.Errorf("libimage error: cannot remove external containers without callback")}
|
||||
return nil, []error{errors.New("libimage error: cannot remove external containers without callback")}
|
||||
}
|
||||
|
||||
// The logic here may require some explanation. Image removal is
|
||||
|
||||
2
vendor/github.com/containers/common/libimage/save.go
generated
vendored
2
vendor/github.com/containers/common/libimage/save.go
generated
vendored
@ -53,7 +53,7 @@ func (r *Runtime) Save(ctx context.Context, names []string, format, path string,
|
||||
return fmt.Errorf("unsupported format %q for saving multiple images (only docker-archive)", format)
|
||||
}
|
||||
if len(options.AdditionalTags) > 0 {
|
||||
return fmt.Errorf("cannot save multiple images with multiple tags")
|
||||
return errors.New("cannot save multiple images with multiple tags")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user