github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

adds oci image spec to image info placed into imagestore

Browse Source 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown
2017-12-12 15:08:01 -06:00
parent 03ac989644
commit 31223fd5b1
13 changed files with 56 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/server/container_stop.go
View File

@@ -80,11 +80,11 @@ func (c *criContainerdService) stopContainer(ctx context.Context, container cont
// an error here.
return fmt.Errorf("failed to get image metadata %q: %v", container.ImageRef, err)
}
if image.Config.StopSignal != "" {
stopSignal, err = signal.ParseSignal(image.Config.StopSignal)
if image.ImageSpec.Config.StopSignal != "" {
stopSignal, err = signal.ParseSignal(image.ImageSpec.Config.StopSignal)
if err != nil {
return fmt.Errorf("failed to parse stop signal %q: %v",
image.Config.StopSignal, err)
image.ImageSpec.Config.StopSignal, err)
}
}
glog.V(2).Infof("Stop container %q with signal %v", id, stopSignal)