containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4821 from AkihiroSuda/fix-rootlessport 

rootlessport: remove state dir on exit + honor ctr.runtime.config.TmpDir
This commit is contained in:
OpenShift Merge Robot 2020-01-09 13:50:49 +01:00 committed by GitHub
parent aaf94c84e7 556cc1fadf
commit fe49aa0f50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libpod/networking_linux.go
View File

@ -344,6 +344,7 @@ func (r *Runtime) setupRootlessPortMapping(ctr *Container, netnsPath string) (er
NetNSPath: netnsPath, NetNSPath: netnsPath,
ExitFD: 3, ExitFD: 3,
ReadyFD: 4, ReadyFD: 4,
TmpDir: ctr.runtime.config.TmpDir,
} }
cfgJSON, err := json.Marshal(cfg) cfgJSON, err := json.Marshal(cfg)
if err != nil { if err != nil {

4
pkg/rootlessport/rootlessport_linux.go
View File

@ -46,6 +46,7 @@ type Config struct {
NetNSPath string NetNSPath string
ExitFD int ExitFD int
ReadyFD int ReadyFD int
TmpDir string
} }
func init() { func init() {
@ -101,10 +102,11 @@ func parent() error {
} }
// create the parent driver // create the parent driver
stateDir, err := ioutil.TempDir("", "rootlessport") stateDir, err := ioutil.TempDir(cfg.TmpDir, "rootlessport")
if err != nil { if err != nil {
return err return err
} }
defer os.RemoveAll(stateDir)
driver, err := rkbuiltin.NewParentDriver(&logrusWriter{prefix: "parent: "}, stateDir) driver, err := rkbuiltin.NewParentDriver(&logrusWriter{prefix: "parent: "}, stateDir)
if err != nil { if err != nil {
return err return err