opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-20 12:43:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor: bump c/common to v0.56.1-0.20230919073449-d1d9d38d8282

Browse Source 
Signed-off-by: Aditya R <arajan@redhat.com>
This commit is contained in:
Aditya R
2023-09-19 13:55:43 +05:30
parent d912e735a3
commit e9b98510dd
8 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
vendor/github.com/containers/common/libimage/layer_tree.go generated vendored
View File

@ -199,6 +199,17 @@ func (t *layerTree) children(ctx context.Context, parent *Image, all bool) ([]*I
if parent.TopLayer() == "" {
for i := range t.emptyImages {
empty := t.emptyImages[i]
isManifest, err := empty.IsManifestList(ctx)
if err != nil {
return nil, err
}
if isManifest {
// If this is a manifest list and is already
// marked as empty then no instance can be
// selected from this list therefore its
// better to skip this.
continue
}
isParent, err := checkParent(empty)
if err != nil {
return nil, err
@ -289,6 +300,17 @@ func (t *layerTree) parent(ctx context.Context, child *Image) (*Image, error) {
if childID == empty.ID() {
continue
}
isManifest, err := empty.IsManifestList(ctx)
if err != nil {
return nil, err
}
if isManifest {
// If this is a manifest list and is already
// marked as empty then no instance can be
// selected from this list therefore its
// better to skip this.
continue
}
emptyOCI, err := t.toOCI(ctx, empty)
if err != nil {
if ErrorIsImageUnknown(err) {

4
vendor/github.com/containers/common/pkg/config/containers.conf generated vendored
View File

@ -669,8 +669,8 @@ default_sysctls = [
# [engine.service_destinations.production]
# URI to access the Podman service
# Examples:
# rootless "unix://run/user/$UID/podman/podman.sock" (Default)
# rootful "unix://run/podman/podman.sock (Default)
# rootless "unix:///run/user/$UID/podman/podman.sock" (Default)
# rootful "unix:///run/podman/podman.sock (Default)
# remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
# remote rootful ssh://root@10.10.1.136:22/run/podman/podman.sock
#

4
vendor/github.com/containers/common/pkg/config/containers.conf-freebsd generated vendored
View File

@ -541,8 +541,8 @@ default_sysctls = [
# [service_destinations.production]
# URI to access the Podman service
# Examples:
# rootless "unix://run/user/$UID/podman/podman.sock" (Default)
# rootful "unix://run/podman/podman.sock (Default)
# rootless "unix:///run/user/$UID/podman/podman.sock" (Default)
# rootful "unix:///run/podman/podman.sock (Default)
# remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
# remote rootful ssh://root@10.10.1.136:22/run/podman/podman.sock
#

2
vendor/github.com/containers/common/pkg/config/default.go generated vendored
View File

@ -268,7 +268,7 @@ func defaultFarmConfig() FarmConfig {
}
}
// defaultEngineConfig eturns a default engine configuration. Note that the
// defaultEngineConfig returns a default engine configuration. Note that the
// config is different for root and rootless. It also parses the storage.conf.
func defaultEngineConfig() (*EngineConfig, error) {
c := new(EngineConfig)

2
vendor/github.com/containers/common/version/version.go generated vendored
View File

@ -1,4 +1,4 @@
package version
// Version is the version of the build.
const Version = "0.56.0"
const Version = "0.56.1-dev"