diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-25 08:20:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-25 08:20:38 -0400 |
| commit | b4767817012a3aedaf05dc7a32bd823fcd3776f4 (patch) | |
| tree | 2fa1c72aaecad072f3ea4b3283fed20e245c071e /vendor | |
| parent | 2d191968b513d327e39376bf8fadd2b4267d15a2 (diff) | |
| parent | f95b0995e521e252af52edaf57a31241d364e3d8 (diff) | |
| download | podman-b4767817012a3aedaf05dc7a32bd823fcd3776f4.tar.gz podman-b4767817012a3aedaf05dc7a32bd823fcd3776f4.tar.bz2 podman-b4767817012a3aedaf05dc7a32bd823fcd3776f4.zip | |
Merge pull request #10774 from vrothberg/registries
remove `pkg/registries`
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/common/libimage/runtime.go | 5 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/vendor/github.com/containers/common/libimage/runtime.go b/vendor/github.com/containers/common/libimage/runtime.go index 3cbd3dcf4..d07d6a83a 100644 --- a/vendor/github.com/containers/common/libimage/runtime.go +++ b/vendor/github.com/containers/common/libimage/runtime.go @@ -54,6 +54,11 @@ type Runtime struct { } // Returns a copy of the runtime's system context. +func (r *Runtime) SystemContext() *types.SystemContext { + return r.systemContextCopy() +} + +// Returns a copy of the runtime's system context. func (r *Runtime) systemContextCopy() *types.SystemContext { var sys types.SystemContext deepcopy.Copy(&sys, &r.systemContext) diff --git a/vendor/modules.txt b/vendor/modules.txt index c4cfc0d83..b749ff8e3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containers/buildah/pkg/overlay github.com/containers/buildah/pkg/parse github.com/containers/buildah/pkg/rusage github.com/containers/buildah/util -# github.com/containers/common v0.40.2-0.20210623133759-d13a31743aec +# github.com/containers/common v0.40.2-0.20210624120009-b1d3c4dc2515 github.com/containers/common/libimage github.com/containers/common/libimage/manifests github.com/containers/common/pkg/apparmor |