opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2126 from giuseppe/set-prlimit

Browse Source 
podman: bump RLIMIT_NOFILE also without CAP_SYS_RESOURCE
This commit is contained in:
OpenShift Merge Robot
2019-01-10 11:38:59 -08:00
committed by GitHub
parent 6524041fb0 a2c1a2df54
commit c3f632d85a
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/podman/main.go
View File

@ -148,16 +148,20 @@ func main() {
logrus.SetLevel(level)
}
// Only if not rootless, set rlimits for open files.
// We open numerous FDs for ports opened
if !rootless.IsRootless() {
rlimits := new(syscall.Rlimit)
rlimits.Cur = 1048576
rlimits.Max = 1048576
rlimits := new(syscall.Rlimit)
rlimits.Cur = 1048576
rlimits.Max = 1048576
if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil {
if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil {
return errors.Wrapf(err, "error getting rlimits")
}
rlimits.Cur = rlimits.Max
if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil {
return errors.Wrapf(err, "error setting new rlimits")
}
} else {
}
if rootless.IsRootless() {
logrus.Info("running as rootless")
}

2
libpod/container_easyjson.go
View File

@ -1,6 +1,6 @@
// +build seccomp ostree selinux varlink exclude_graphdriver_devicemapper
// Code generated by easyjson for marshaling/unmarshaling. DO NOT EDIT
// Code generated by easyjson for marshaling/unmarshaling. DO NOT EDIT.
package libpod