Merge pull request #1080 from zhsj/rm-partial-docker

Use ParseSignal and AtomicWriteFile functions from containerd
This commit is contained in:
Lantao Liu
2019-03-08 10:53:05 -08:00
committed by GitHub
20 changed files with 4 additions and 1169 deletions

View File

@@ -22,7 +22,6 @@ import (
"github.com/containerd/containerd"
eventtypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/errdefs"
"github.com/docker/docker/pkg/signal"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
@@ -134,7 +133,7 @@ func (c *criService) stopContainer(ctx context.Context, container containerstore
}
}
}
sig, err := signal.ParseSignal(stopSignal)
sig, err := containerd.ParseSignal(stopSignal)
if err != nil {
return errors.Wrapf(err, "failed to parse stop signal %q", stopSignal)
}