diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-05-12 13:23:58 +0200 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-06-07 15:13:55 +0200 |
| commit | ddf1d2cb38aee698cc176f4ab291b22c6a47644d (patch) | |
| tree | c7ebfad0ab40b67bdb2090f30a727903912154fe /vendor | |
| parent | 1ada01a038fceaa9e94beb2de6e4593df03be7fa (diff) | |
| download | podman-ddf1d2cb38aee698cc176f4ab291b22c6a47644d.tar.gz podman-ddf1d2cb38aee698cc176f4ab291b22c6a47644d.tar.bz2 podman-ddf1d2cb38aee698cc176f4ab291b22c6a47644d.zip | |
update c/common to latest
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/common/libimage/inspect.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/common/libimage/pull.go | 3 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/vendor/github.com/containers/common/libimage/inspect.go b/vendor/github.com/containers/common/libimage/inspect.go index 05d60edfc..ae06acd2c 100644 --- a/vendor/github.com/containers/common/libimage/inspect.go +++ b/vendor/github.com/containers/common/libimage/inspect.go @@ -128,7 +128,7 @@ func (i *Image) Inspect(ctx context.Context, options *InspectOptions) (*ImageDat Config: &ociImage.Config, Version: info.DockerVersion, Size: size, - VirtualSize: size, // TODO: they should be different (inherited from Podman) + VirtualSize: size, // NOTE: same as size. Inherited from Docker where it's scheduled for deprecation. Digest: i.Digest(), Labels: info.Labels, RootFS: &RootFS{ diff --git a/vendor/github.com/containers/common/libimage/pull.go b/vendor/github.com/containers/common/libimage/pull.go index 771756160..d204ef1c4 100644 --- a/vendor/github.com/containers/common/libimage/pull.go +++ b/vendor/github.com/containers/common/libimage/pull.go @@ -533,9 +533,6 @@ func (r *Runtime) copySingleImageFromRegistry(ctx context.Context, imageName str sys := r.systemContextCopy() resolved, err := shortnames.Resolve(sys, imageName) if err != nil { - // TODO: that is a too big of a hammer since we should only - // ignore errors that indicate that there's no alias and no - // USRs. Must be addressed in c/image first. if localImage != nil && pullPolicy == config.PullPolicyNewer { return []string{resolvedImageName}, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index f6e22e68a..a42943eef 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -109,7 +109,7 @@ github.com/containers/buildah/pkg/rusage github.com/containers/buildah/pkg/sshagent github.com/containers/buildah/pkg/util github.com/containers/buildah/util -# github.com/containers/common v0.48.1-0.20220523155016-2fd37da97824 +# github.com/containers/common v0.48.1-0.20220528105338-54c8092c69a1 ## explicit github.com/containers/common/libimage github.com/containers/common/libimage/define |