opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-30 07:26:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8725 from rhatdan/TMPDIR

Browse Source 
Allow users to specify TMPDIR in containers.conf
This commit is contained in:
OpenShift Merge Robot
2020-12-15 19:35:39 +00:00
committed by GitHub
parent 999d40d2c7 d5e05a4b92
commit 9379ee9790
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/main.go
View File

@ -31,11 +31,6 @@ func main() {
return return
} }
// Hard code TMPDIR functions to use /var/tmp, if user did not override
if _, ok := os.LookupEnv("TMPDIR"); !ok {
os.Setenv("TMPDIR", "/var/tmp")
}
rootCmd = parseCommands() rootCmd = parseCommands()
Execute() Execute()

4
cmd/podman/root.go
View File

@ -178,6 +178,10 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
return err return err
} }
} }
// Hard code TMPDIR functions to use /var/tmp, if user did not override
if _, ok := os.LookupEnv("TMPDIR"); !ok {
os.Setenv("TMPDIR", "/var/tmp")
}
if !registry.IsRemote() { if !registry.IsRemote() {
if cmd.Flag("cpu-profile").Changed { if cmd.Flag("cpu-profile").Changed {