libimage should be using containers.conf for tmpdir

if image_copy_tmp_dir is set in containers.conf it needs to be used in
the systemcontext for BigFilesTemporaryDir value.

Fixes: containers/podman#14091

Signed-off-by: Daniel J Walsh <[email protected]>

Author: rhatdan

libimage/runtime.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/docker/reference"
 	"github.com/containers/image/v5/pkg/shortnames"
 	storageTransport "github.com/containers/image/v5/storage"
@@ -22,13 +23,16 @@ import (
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
 
 // tmpdir returns a path to a temporary directory.
-func tmpdir() string {
-	tmpdir := os.Getenv("TMPDIR")
-	if tmpdir == "" {
-		tmpdir = "/var/tmp"
+func tmpdir() (string, error) {
+	var tmpdir string
+	defaultContainerConfig, err := config.Default()
+	if err == nil {
+		tmpdir, err = defaultContainerConfig.ImageCopyTmpDir()
+		if err == nil {
+			return tmpdir, nil
+		}
 	}
-
-	return tmpdir
+	return tmpdir, err
 }
 
 // RuntimeOptions allow for creating a customized Runtime.
@@ -103,7 +107,11 @@ func RuntimeFromStore(store storage.Store, options *RuntimeOptions) (*Runtime, e
 		systemContext = types.SystemContext{}
 	}
 	if systemContext.BigFilesTemporaryDir == "" {
-		systemContext.BigFilesTemporaryDir = tmpdir()
+		tmpdir, err := tmpdir()
+		if err != nil {
+			return nil, err
+		}
+		systemContext.BigFilesTemporaryDir = tmpdir
 	}
 
 	setRegistriesConfPath(&systemContext)

libimage/runtime_test.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/types"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/reexec"
@@ -46,7 +47,9 @@ func testNewRuntime(t *testing.T, options ...testNewRuntimeOptions) (runtime *Ru
 
 	runtime, err = RuntimeFromStoreOptions(&RuntimeOptions{SystemContext: systemContext}, storeOptions)
 	require.NoError(t, err)
-	require.Equal(t, runtime.systemContext.BigFilesTemporaryDir, tmpdir())
+	tmpd, err := tmpdir()
+	require.NoError(t, err)
+	require.Equal(t, runtime.systemContext.BigFilesTemporaryDir, tmpd)
 
 	cleanup = func() {
 		_ = runtime.Shutdown(true)
@@ -57,3 +60,40 @@ func testNewRuntime(t *testing.T, options ...testNewRuntimeOptions) (runtime *Ru
 	require.NotNil(t, sys)
 	return runtime, cleanup
 }
+
+func TestTmpdir(t *testing.T) {
+	tmpStr := "TMPDIR"
+	tmp, tmpSet := os.LookupEnv(tmpStr)
+
+	confStr := "CONTAINERS_CONF"
+	conf, confSet := os.LookupEnv(confStr)
+
+	os.Setenv(confStr, "testdata/containers.conf")
+	config.Reload()
+	tmpd, err := tmpdir()
+	require.NoError(t, err)
+	require.Equal(t, "/tmp/from/containers.conf", tmpd)
+
+	if confSet {
+		os.Setenv(confStr, conf)
+	} else {
+		os.Unsetenv(confStr)
+	}
+	config.Reload()
+
+	os.Unsetenv(tmpStr)
+	tmpd, err = tmpdir()
+	require.NoError(t, err)
+	require.Equal(t, "/var/tmp", tmpd)
+
+	os.Setenv(tmpStr, "/tmp/test")
+	tmpd, err = tmpdir()
+	require.NoError(t, err)
+	require.Equal(t, "/tmp/test", tmpd)
+	if tmpSet {
+		os.Setenv(tmpStr, tmp)
+	} else {
+		os.Unsetenv(tmpStr)
+	}
+
+}

libimage/testdata/containers.conf

@@ -0,0 +1,5 @@
+[engine]
+# Default location for storing temporary container image content. Can be overridden with the TMPDIR environment
+# variable. If you specify "storage", then the location of the
+# container/storage tmp directory will be used.
+image_copy_tmp_dir="/tmp/from/containers.conf"