From df43bfe53dfa2ea6cdf6c37ba567894340799416 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Thu, 20 Jun 2019 15:14:28 -0400
Subject: Handle containers whose OCIRuntime fields are paths
Try and locate the right runtime by using the basename of the
path.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
libpod/boltdb_state_internal.go | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
(limited to 'libpod')
diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go
index 2ac1867aa..a4818f2c8 100644
--- a/libpod/boltdb_state_internal.go
+++ b/libpod/boltdb_state_internal.go
@@ -2,6 +2,7 @@ package libpod
import (
"bytes"
+ "path/filepath"
"runtime"
"strings"
@@ -307,7 +308,14 @@ func (s *BoltState) getContainerFromDB(id []byte, ctr *Container, ctrsBkt *bolt.
if ctr.config.OCIRuntime == "" {
ctr.ociRuntime = s.runtime.defaultOCIRuntime
} else {
- ociRuntime, ok := s.runtime.ociRuntimes[ctr.config.OCIRuntime]
+ // Handle legacy containers which might use a literal path for
+ // their OCI runtime name.
+ runtimeName := ctr.config.OCIRuntime
+ if strings.HasPrefix(runtimeName, "/") {
+ runtimeName = filepath.Base(runtimeName)
+ }
+
+ ociRuntime, ok := s.runtime.ociRuntimes[runtimeName]
if !ok {
return errors.Wrapf(ErrInternal, "container %s was created with OCI runtime %s, but that runtime is not available in the current configuration", ctr.ID(), ctr.config.OCIRuntime)
}
--
cgit v1.2.3-54-g00ecf