mirror of
https://github.com/containers/podman.git
synced 2025-11-13 17:47:13 +08:00
vendor buildah@main
Note that the bud-logfile-with-split-logfile-by-platform test is skipped on the remote client (see #14544). Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
17
vendor/github.com/containers/buildah/util/util.go
generated
vendored
17
vendor/github.com/containers/buildah/util/util.go
generated
vendored
@@ -14,6 +14,7 @@ import (
|
||||
"github.com/containers/buildah/define"
|
||||
"github.com/containers/common/libimage"
|
||||
"github.com/containers/common/pkg/config"
|
||||
"github.com/containers/common/pkg/util"
|
||||
"github.com/containers/image/v5/docker/reference"
|
||||
"github.com/containers/image/v5/pkg/shortnames"
|
||||
"github.com/containers/image/v5/signature"
|
||||
@@ -44,6 +45,11 @@ var (
|
||||
}
|
||||
)
|
||||
|
||||
// StringInSlice is deprecated, use github.com/containers/common/pkg/util.StringInSlice
|
||||
func StringInSlice(s string, slice []string) bool {
|
||||
return util.StringInSlice(s, slice)
|
||||
}
|
||||
|
||||
// resolveName checks if name is a valid image name, and if that name doesn't
|
||||
// include a domain portion, returns a list of the names which it might
|
||||
// correspond to in the set of configured registries, and the transport used to
|
||||
@@ -244,17 +250,6 @@ func Runtime() string {
|
||||
return conf.Engine.OCIRuntime
|
||||
}
|
||||
|
||||
// StringInSlice returns a boolean indicating if the exact value s is present
|
||||
// in the slice slice.
|
||||
func StringInSlice(s string, slice []string) bool {
|
||||
for _, v := range slice {
|
||||
if v == s {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// GetContainerIDs uses ID mappings to compute the container-level IDs that will
|
||||
// correspond to a UID/GID pair on the host.
|
||||
func GetContainerIDs(uidmap, gidmap []specs.LinuxIDMapping, uid, gid uint32) (uint32, uint32, error) {
|
||||
|
||||
Reference in New Issue
Block a user