Merge pull request #8725 from rhatdan/TMPDIR

Allow users to specify TMPDIR in containers.conf
containers · Dec 15, 2020 · 9379ee9 · 9379ee9
2 parents 999d40d + d5e05a4
commit 9379ee9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
@@ -31,11 +31,6 @@ func main() {
 		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()
 
 	Execute()

diff --git a/cmd/podman/root.go b/cmd/podman/root.go
@@ -178,6 +178,10 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
 			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 cmd.Flag("cpu-profile").Changed {