From c4feaa75cf37cf0af272e443c2d5c6dd632dcc5c Mon Sep 17 00:00:00 2001 From: Ace-Tang Date: Fri, 9 Nov 2018 10:29:40 +0800 Subject: [PATCH] fix: fix failed to get container-shim relation with io.containerd.runc.v1 add '-id' flag when start container with io.containerd.runc.v1 shim, or user can not get container-shim relation from 'ps -ef',like ``` /usr/bin/containerd-shim-runc-v1 -namespace default -address /run/containerd/containerd.sock -publish-binary /usr/bin/containerd ``` Signed-off-by: Ace-Tang --- runtime/v2/runc/service.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runtime/v2/runc/service.go b/runtime/v2/runc/service.go index e3c78d6e7..cb6f5e552 100644 --- a/runtime/v2/runc/service.go +++ b/runtime/v2/runc/service.go @@ -110,7 +110,7 @@ type service struct { cancel func() } -func newCommand(ctx context.Context, containerdBinary, containerdAddress string) (*exec.Cmd, error) { +func newCommand(ctx context.Context, id, containerdBinary, containerdAddress string) (*exec.Cmd, error) { ns, err := namespaces.NamespaceRequired(ctx) if err != nil { return nil, err @@ -125,6 +125,7 @@ func newCommand(ctx context.Context, containerdBinary, containerdAddress string) } args := []string{ "-namespace", ns, + "-id", id, "-address", containerdAddress, "-publish-binary", containerdBinary, } @@ -138,7 +139,7 @@ func newCommand(ctx context.Context, containerdBinary, containerdAddress string) } func (s *service) StartShim(ctx context.Context, id, containerdBinary, containerdAddress string) (string, error) { - cmd, err := newCommand(ctx, containerdBinary, containerdAddress) + cmd, err := newCommand(ctx, id, containerdBinary, containerdAddress) if err != nil { return "", err }