diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-11 16:26:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 16:26:46 +0100 |
| commit | 921f98f8795eb9fcb19ce581020cfdeff6dee09f (patch) | |
| tree | 82dc53e3c61fec956eef1efa3e540d1abe5df7f4 /pkg | |
| parent | dc5c061cdcad2f815d9f8c0556a3e13824e6ba75 (diff) | |
| parent | cbeca379250932f01fa4e2ffc70e9c2ecd6701bc (diff) | |
| download | podman-921f98f8795eb9fcb19ce581020cfdeff6dee09f.tar.gz podman-921f98f8795eb9fcb19ce581020cfdeff6dee09f.tar.bz2 podman-921f98f8795eb9fcb19ce581020cfdeff6dee09f.zip | |
Merge pull request #2294 from mheon/v1.0_backports
V1.0 backports
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/spec/spec.go | 4 | ||||
| -rw-r--r-- | pkg/varlinkapi/images.go | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index 9ef0223f2..46105af4a 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -376,6 +376,10 @@ func CreateConfigToOCISpec(config *CreateConfig) (*spec.Spec, error) { //nolint } func blockAccessToKernelFilesystems(config *CreateConfig, g *generate.Generator) { + if config.PidMode.IsHost() && rootless.IsRootless() { + return + } + if !config.Privileged { for _, mp := range []string{ "/proc/acpi", diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go index 8f8934025..cfcdde6ef 100644 --- a/pkg/varlinkapi/images.go +++ b/pkg/varlinkapi/images.go @@ -620,3 +620,12 @@ func (i *LibpodAPI) ContainerRunlabel(call iopodman.VarlinkCall, input iopodman. } return call.ReplyContainerRunlabel() } + +// ImagesPrune .... +func (i *LibpodAPI) ImagesPrune(call iopodman.VarlinkCall, all bool) error { + prunedImages, err := i.Runtime.ImageRuntime().PruneImages(all) + if err != nil { + return call.ReplyErrorOccurred(err.Error()) + } + return call.ReplyImagesPrune(prunedImages) +} |