opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 12:12:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

rootlessport: honor ctr.runtime.config.TmpDir

Browse Source 
Previously, rootlessport was using /var/tmp as the tmp dir.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda
2020-01-09 14:06:33 +09:00
parent 5990f0f142
commit 556cc1fadf
2 changed files with 3 additions and 1 deletions
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 {

3
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,7 +102,7 @@ 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
} }