diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-07-08 07:59:35 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-09 14:02:06 +0000 |
| commit | c7424b69911222c2dc92a41308685f1e6d36fb53 (patch) | |
| tree | dd3b5a75198a72653973566dcf15ad0b55f367d4 /vendor/github.com/projectatomic/buildah/run.go | |
| parent | f661e1d21d5f22d889842642dbd612ead54a7612 (diff) | |
| download | podman-c7424b69911222c2dc92a41308685f1e6d36fb53.tar.gz podman-c7424b69911222c2dc92a41308685f1e6d36fb53.tar.bz2 podman-c7424b69911222c2dc92a41308685f1e6d36fb53.zip | |
Vendor in latest buildah to add masks for /proc/keys and /proc/acpi
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1062
Approved by: baude
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/run.go')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/run.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vendor/github.com/projectatomic/buildah/run.go b/vendor/github.com/projectatomic/buildah/run.go index 4c9f83acd..6d9fa260f 100644 --- a/vendor/github.com/projectatomic/buildah/run.go +++ b/vendor/github.com/projectatomic/buildah/run.go @@ -598,7 +598,9 @@ func (b *Builder) addNetworkConfig(rdir, hostPath string, chownOpts *idtools.IDP func setupMaskedPaths(g *generate.Generator) { for _, mp := range []string{ + "/proc/acpi", "/proc/kcore", + "/proc/keys", "/proc/latency_stats", "/proc/timer_list", "/proc/timer_stats", @@ -749,7 +751,7 @@ func setupNamespaces(g *generate.Generator, namespaceOptions NamespaceOptions, i // If we've got mappings, we're going to have to create a user namespace. if len(idmapOptions.UIDMap) > 0 || len(idmapOptions.GIDMap) > 0 || configureUserns { if hostPidns { - return false, nil, false, errors.Wrapf(err, "unable to mix host PID namespace with user namespace") + return false, nil, false, errors.New("unable to mix host PID namespace with user namespace") } if err := g.AddOrReplaceLinuxNamespace(specs.UserNamespace, ""); err != nil { return false, nil, false, errors.Wrapf(err, "error adding new %q namespace for run", string(specs.UserNamespace)) |