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

Save bootstrap.json instead of address file

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko
2023-10-13 15:12:25 -07:00
parent e03bf32b86
commit 8061cb0237
7 changed files with 123 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/v2/runc/manager/manager_linux.go
View File

@@ -153,9 +153,6 @@ func (manager) Start(ctx context.Context, id string, opts shim.StartOpts) (_ shi
return params, fmt.Errorf("create new shim socket: %w", err)
}
if shim.CanConnect(address) {
if err := shim.WriteAddress("address", address); err != nil {
return params, fmt.Errorf("write existing socket for shim: %w", err)
}
params.Address = address
return params, nil
}
@@ -173,11 +170,6 @@ func (manager) Start(ctx context.Context, id string, opts shim.StartOpts) (_ shi
}
}()
// make sure that reexec shim-v2 binary use the value if need
if err := shim.WriteAddress("address", address); err != nil {
return params, err
}
f, err := socket.File()
if err != nil {
return params, err