diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-21 03:50:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 03:50:31 -0400 |
| commit | 9ec4d04592a7a7a833e4eefbe14e77af2da1f92d (patch) | |
| tree | d8bbd129c48117f4954b4296f37c57f407b0f76c /libpod | |
| parent | 928687e1dab6b0dd57f5673791f33a3b336830d8 (diff) | |
| parent | 7864108ff191e2d78666fb5bdf098d295b7bae59 (diff) | |
| download | podman-9ec4d04592a7a7a833e4eefbe14e77af2da1f92d.tar.gz podman-9ec4d04592a7a7a833e4eefbe14e77af2da1f92d.tar.bz2 podman-9ec4d04592a7a7a833e4eefbe14e77af2da1f92d.zip | |
Merge pull request #10723 from rhatdan/tmpdir
fix systemcontext to use correct TMPDIR
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/options.go | 6 | ||||
| -rw-r--r-- | libpod/runtime.go | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libpod/options.go b/libpod/options.go index d3be46ad8..f2468e41b 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 } diff --git a/libpod/runtime.go b/libpod/runtime.go index d775b55e1..84649bf3e 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -15,6 +15,7 @@ import ( "syscall" "time" + "github.com/containers/buildah/pkg/parse" "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/defaultnet" @@ -381,7 +382,9 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) { // Set up containers/image if runtime.imageContext == nil { - runtime.imageContext = &types.SystemContext{} + runtime.imageContext = &types.SystemContext{ + BigFilesTemporaryDir: parse.GetTempDir(), + } } runtime.imageContext.SignaturePolicyPath = runtime.config.Engine.SignaturePolicyPath |