opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 14:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16908 from alexlarsson/transient-bundle-path

Browse Source 
When in transient store mode, use rundir for bundlepath
This commit is contained in:
OpenShift Merge Robot
2022-12-21 11:16:18 -05:00
committed by GitHub
parent af805b3efe 3808067ff8
commit ac9a357406
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libpod/container_internal.go
View File

@ -128,6 +128,9 @@ func (c *Container) rwSize() (int64, error) {
// bundlePath returns the path to the container's root filesystem - where the OCI spec will be // bundlePath returns the path to the container's root filesystem - where the OCI spec will be
// placed, amongst other things // placed, amongst other things
func (c *Container) bundlePath() string { func (c *Container) bundlePath() string {
if c.runtime.storageConfig.TransientStore {
return c.state.RunDir
}
return c.config.StaticDir return c.config.StaticDir
} }

1
libpod/container_internal_test.go
View File

@ -118,6 +118,7 @@ func TestPostDeleteHooks(t *testing.T) {
statePath := filepath.Join(dir, "state") statePath := filepath.Join(dir, "state")
copyPath := filepath.Join(dir, "copy") copyPath := filepath.Join(dir, "copy")
c := Container{ c := Container{
runtime: &Runtime{},
config: &ContainerConfig{ config: &ContainerConfig{
ID: "123abc", ID: "123abc",
Spec: &rspec.Spec{ Spec: &rspec.Spec{