mirror of
https://github.com/containers/podman.git
synced 2025-09-25 07:44:24 +08:00
Bump github.com/containers/common from 0.38.4 to 0.39.0
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.38.4 to 0.39.0. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.38.4...v0.39.0) Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
19
vendor/github.com/containers/common/libimage/image.go
generated
vendored
19
vendor/github.com/containers/common/libimage/image.go
generated
vendored
@ -658,25 +658,6 @@ func (i *Image) Unmount(force bool) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// MountPoint returns the fully-evaluated mount point of the image. If the
|
||||
// image isn't mounted, an empty string is returned.
|
||||
func (i *Image) MountPoint() (string, error) {
|
||||
counter, err := i.runtime.store.Mounted(i.TopLayer())
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
if counter == 0 {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
layer, err := i.runtime.store.Layer(i.TopLayer())
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return filepath.EvalSymlinks(layer.MountPoint)
|
||||
}
|
||||
|
||||
// Size computes the size of the image layers and associated data.
|
||||
func (i *Image) Size() (int64, error) {
|
||||
return i.runtime.store.ImageSize(i.ID())
|
||||
|
1
vendor/github.com/containers/common/libimage/pull.go
generated
vendored
1
vendor/github.com/containers/common/libimage/pull.go
generated
vendored
@ -279,6 +279,7 @@ func (r *Runtime) copyFromRegistry(ctx context.Context, ref types.ImageReference
|
||||
return r.copySingleImageFromRegistry(ctx, inputName, pullPolicy, options)
|
||||
}
|
||||
|
||||
// Copy all tags
|
||||
named := reference.TrimNamed(ref.DockerReference())
|
||||
tags, err := registryTransport.GetRepositoryTags(ctx, &r.systemContext, ref)
|
||||
if err != nil {
|
||||
|
8
vendor/github.com/containers/common/libimage/runtime.go
generated
vendored
8
vendor/github.com/containers/common/libimage/runtime.go
generated
vendored
@ -516,8 +516,9 @@ type RemoveImagesOptions struct {
|
||||
WithSize bool
|
||||
}
|
||||
|
||||
// RemoveImages removes images specified by names. All images are expected to
|
||||
// exist in the local containers storage.
|
||||
// RemoveImages removes images specified by names. If no names are specified,
|
||||
// remove images as specified via the options' filters. All images are
|
||||
// expected to exist in the local containers storage.
|
||||
//
|
||||
// If an image has more names than one name, the image will be untagged with
|
||||
// the specified name. RemoveImages returns a slice of untagged and removed
|
||||
@ -557,6 +558,9 @@ func (r *Runtime) RemoveImages(ctx context.Context, names []string, options *Rem
|
||||
// orderedIDs and the deleteMap.
|
||||
switch {
|
||||
case len(names) > 0:
|
||||
// Look up the images one-by-one. That allows for removing
|
||||
// images that have been looked up successfully while reporting
|
||||
// lookup errors at the end.
|
||||
lookupOptions := LookupImageOptions{IgnorePlatform: true}
|
||||
for _, name := range names {
|
||||
img, resolvedName, err := r.LookupImage(name, &lookupOptions)
|
||||
|
5
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
5
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@ -150,6 +150,11 @@ type ContainersConfig struct {
|
||||
// PidNS indicates how to create a pid namespace for the container
|
||||
PidNS string `toml:"pidns,omitempty"`
|
||||
|
||||
// RootlessNetworking depicts the "kind" of networking for rootless
|
||||
// containers. Valid options are `slirp4netns` and `cni`. Default is
|
||||
// `slirp4netns`
|
||||
RootlessNetworking string `toml:"rootless_networking,omitempty"`
|
||||
|
||||
// SeccompProfile is the seccomp.json profile path which is used as the
|
||||
// default for the runtime.
|
||||
SeccompProfile string `toml:"seccomp_profile,omitempty"`
|
||||
|
3
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
3
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
@ -389,6 +389,9 @@ default_sysctls = [
|
||||
# `podman --remote=true` for access to the remote Podman service.
|
||||
# remote = false
|
||||
|
||||
# Indicates the networking to be used for rootless containers
|
||||
# rootless_networking="slirp4netns"
|
||||
|
||||
# Directory for persistent engine files (database, etc)
|
||||
# By default, this will be configured relative to where the containers/storage
|
||||
# stores containers
|
||||
|
50
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
50
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@ -82,6 +82,10 @@ var (
|
||||
"/usr/local/lib/cni",
|
||||
"/opt/cni/bin",
|
||||
}
|
||||
|
||||
// DefaultRootlessNetwork is the kind of of rootless networking
|
||||
// for containers
|
||||
DefaultRootlessNetwork = "slirp4netns"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -186,24 +190,25 @@ func DefaultConfig() (*Config, error) {
|
||||
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
"TERM=xterm",
|
||||
},
|
||||
EnvHost: false,
|
||||
HTTPProxy: true,
|
||||
Init: false,
|
||||
InitPath: "",
|
||||
IPCNS: "private",
|
||||
LogDriver: DefaultLogDriver,
|
||||
LogSizeMax: DefaultLogSizeMax,
|
||||
NetNS: netns,
|
||||
NoHosts: false,
|
||||
PidsLimit: DefaultPidsLimit,
|
||||
PidNS: "private",
|
||||
SeccompProfile: SeccompDefaultPath,
|
||||
ShmSize: DefaultShmSize,
|
||||
TZ: "",
|
||||
Umask: "0022",
|
||||
UTSNS: "private",
|
||||
UserNS: "host",
|
||||
UserNSSize: DefaultUserNSSize,
|
||||
EnvHost: false,
|
||||
HTTPProxy: true,
|
||||
Init: false,
|
||||
InitPath: "",
|
||||
IPCNS: "private",
|
||||
LogDriver: DefaultLogDriver,
|
||||
LogSizeMax: DefaultLogSizeMax,
|
||||
NetNS: netns,
|
||||
NoHosts: false,
|
||||
PidsLimit: DefaultPidsLimit,
|
||||
PidNS: "private",
|
||||
RootlessNetworking: DefaultRootlessNetwork,
|
||||
SeccompProfile: SeccompDefaultPath,
|
||||
ShmSize: DefaultShmSize,
|
||||
TZ: "",
|
||||
Umask: "0022",
|
||||
UTSNS: "private",
|
||||
UserNS: "host",
|
||||
UserNSSize: DefaultUserNSSize,
|
||||
},
|
||||
Network: NetworkConfig{
|
||||
DefaultNetwork: "podman",
|
||||
@ -410,9 +415,6 @@ func probeConmon(conmonBinary string) error {
|
||||
|
||||
// NetNS returns the default network namespace
|
||||
func (c *Config) NetNS() string {
|
||||
if c.Containers.NetNS == "private" && unshare.IsRootless() {
|
||||
return "slirp4netns"
|
||||
}
|
||||
return c.Containers.NetNS
|
||||
}
|
||||
|
||||
@ -544,3 +546,9 @@ func (c *Config) LogDriver() string {
|
||||
func (c *Config) MachineEnabled() bool {
|
||||
return c.Engine.MachineEnabled
|
||||
}
|
||||
|
||||
// RootlessNetworking returns the "kind" of networking
|
||||
// rootless containers should use
|
||||
func (c *Config) RootlessNetworking() string {
|
||||
return c.Containers.RootlessNetworking
|
||||
}
|
||||
|
2
vendor/github.com/containers/common/version/version.go
generated
vendored
2
vendor/github.com/containers/common/version/version.go
generated
vendored
@ -1,4 +1,4 @@
|
||||
package version
|
||||
|
||||
// Version is the version of the build.
|
||||
const Version = "0.38.4"
|
||||
const Version = "0.39.0"
|
||||
|
Reference in New Issue
Block a user