aboutsummaryrefslogtreecommitdiff
path: root/libpod/options.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-06-18 17:27:39 -0400
committerMatthew Heon <mheon@redhat.com>2021-06-25 09:35:34 -0400
commit9f4afa1ea229cebc45e2bc8525881fe74d79cd1d (patch)
treeee3adb5303604987a12fe17b1709415affe2e262 /libpod/options.go
parent5dabff27db83a0bdbea0e736050f5e3cb2c1d95e (diff)
downloadpodman-9f4afa1ea229cebc45e2bc8525881fe74d79cd1d.tar.gz
podman-9f4afa1ea229cebc45e2bc8525881fe74d79cd1d.tar.bz2
podman-9f4afa1ea229cebc45e2bc8525881fe74d79cd1d.zip
fix systemcontext to use correct TMPDIR
Users are complaining about read/only /var/tmp failing even if TMPDIR=/tmp is set. This PR Fixes: https://github.com/containers/podman/issues/10698 [NO TESTS NEEDED] No way to test this. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> <MH: Fixed cherry-pick conflicts> Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'libpod/options.go')
-rw-r--r--libpod/options.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod/options.go b/libpod/options.go
index ccb15f736..deb78a9e0 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -7,6 +7,7 @@ import (
"strings"
"syscall"
+ "github.com/containers/buildah/pkg/parse"
"github.com/containers/common/pkg/config"
"github.com/containers/common/pkg/secrets"
"github.com/containers/image/v5/manifest"
@@ -268,8 +269,11 @@ func WithRegistriesConf(path string) RuntimeOption {
return errors.Wrap(err, "error locating specified registries.conf")
}
if rt.imageContext == nil {
- rt.imageContext = &types.SystemContext{}
+ rt.imageContext = &types.SystemContext{
+ BigFilesTemporaryDir: parse.GetTempDir(),
+ }
}
+
rt.imageContext.SystemRegistriesConfPath = path
return nil
}