opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3626 from mheon/fix_ps_segfault

Browse Source 
Fix a segfault on Podman no-store commands with refresh
This commit is contained in:
OpenShift Merge Robot
2019-07-24 14:45:01 +02:00
committed by GitHub
parent 091778354e 5fb4feb36a
commit 2283471f8d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libpod/runtime.go
View File

@ -879,14 +879,6 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (err error) {
runtime.imageRuntime.Eventer = eventer runtime.imageRuntime.Eventer = eventer
} }
// Set up a storage service for creating container root filesystems from
// images
storageService, err := getStorageService(runtime.store)
if err != nil {
return err
}
runtime.storageService = storageService
// Set up containers/image // Set up containers/image
runtime.imageContext = &types.SystemContext{ runtime.imageContext = &types.SystemContext{
SignaturePolicyPath: runtime.config.SignaturePolicyPath, SignaturePolicyPath: runtime.config.SignaturePolicyPath,
@ -1330,6 +1322,14 @@ func (r *Runtime) configureStore() error {
r.store = store r.store = store
is.Transport.SetStore(store) is.Transport.SetStore(store)
// Set up a storage service for creating container root filesystems from
// images
storageService, err := getStorageService(r.store)
if err != nil {
return err
}
r.storageService = storageService
ir := image.NewImageRuntimeFromStore(r.store) ir := image.NewImageRuntimeFromStore(r.store)
ir.SignaturePolicyPath = r.config.SignaturePolicyPath ir.SignaturePolicyPath = r.config.SignaturePolicyPath
ir.EventsLogFilePath = r.config.EventsLogFilePath ir.EventsLogFilePath = r.config.EventsLogFilePath