diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-15 13:15:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 13:15:03 -0400 |
| commit | f9d8301c476fcd8498930c518f04920e9e8eeac5 (patch) | |
| tree | ae020d660f63b6d41c016a4ca91ecd577a5c569d /libpod | |
| parent | c0cde378298bd8d5183155c8f62aae574be069eb (diff) | |
| parent | 3e77f960f65687dcb1d571ebe70278028c6de441 (diff) | |
| download | podman-f9d8301c476fcd8498930c518f04920e9e8eeac5.tar.gz podman-f9d8301c476fcd8498930c518f04920e9e8eeac5.tar.bz2 podman-f9d8301c476fcd8498930c518f04920e9e8eeac5.zip | |
Merge pull request #11577 from rhatdan/tmpdir
Set default storage from containers.conf for temporary images
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/define/info.go | 1 | ||||
| -rw-r--r-- | libpod/info.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libpod/define/info.go b/libpod/define/info.go index f4aa0031c..61f2f4c75 100644 --- a/libpod/define/info.go +++ b/libpod/define/info.go @@ -108,6 +108,7 @@ type StoreInfo struct { GraphOptions map[string]interface{} `json:"graphOptions"` GraphRoot string `json:"graphRoot"` GraphStatus map[string]string `json:"graphStatus"` + ImageCopyTmpDir string `json:"imageCopyTmpDir"` ImageStore ImageStore `json:"imageStore"` RunRoot string `json:"runRoot"` VolumePath string `json:"volumePath"` diff --git a/libpod/info.go b/libpod/info.go index 2eba4bbff..7b60ee46f 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -288,6 +288,7 @@ func (r *Runtime) storeInfo() (*define.StoreInfo, error) { info := define.StoreInfo{ ImageStore: imageInfo, + ImageCopyTmpDir: os.Getenv("TMPDIR"), ContainerStore: conInfo, GraphRoot: r.store.GraphRoot(), RunRoot: r.store.RunRoot(), |