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

Merge pull request #2771 from Ace-Tang/runtime_v2_add_id

Browse Source 
fix: fix failed to get container-shim relation with io.containerd.runc.v1
This commit is contained in:
Michael Crosby 2018-11-09 13:26:22 -05:00 committed by GitHub
commit ed5a789889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/v2/runc/service.go
View File

@ -110,7 +110,7 @@ type service struct {
cancel func() 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) ns, err := namespaces.NamespaceRequired(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
@ -125,6 +125,7 @@ func newCommand(ctx context.Context, containerdBinary, containerdAddress string)
} }
args := []string{ args := []string{
"-namespace", ns, "-namespace", ns,
"-id", id,
"-address", containerdAddress, "-address", containerdAddress,
"-publish-binary", containerdBinary, "-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) { 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 { if err != nil {
return "", err return "", err
} }