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

Merge pull request #8012 from dcantah/runtime-clarifications

Browse Source 
runtime docs: Clarify delete cwd behavior
This commit is contained in:
Fu Wei 2023-01-30 14:06:32 +08:00 committed by GitHub
commit 5d482fdd6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/v2/README.md
View File

@ -67,9 +67,9 @@ The delete command MUST accept the following flags:
* `-address` the address of the containerd's main socket * `-address` the address of the containerd's main socket
* `-publish-binary` the binary path to publish events back to containerd * `-publish-binary` the binary path to publish events back to containerd
* `-id` the id of the container * `-id` the id of the container
* `-bundle` the path to the bundle to delete. On non-Windows platforms this will match `cwd` * `-bundle` the path to the bundle to delete. On non-Windows and non-FreeBSD platforms this will match `cwd`
The delete command will be executed in the container's bundle as its `cwd` except for on the Windows platform. The delete command will be executed in the container's bundle as its `cwd` except for on Windows and FreeBSD platforms.
### Host Level Shim Configuration ### Host Level Shim Configuration

2
runtime/v2/binary.go
View File

@ -146,7 +146,7 @@ func (b *binary) Delete(ctx context.Context) (*runtime.Exit, error) {
log.G(ctx).Info("cleaning up dead shim") log.G(ctx).Info("cleaning up dead shim")
// On Windows and FreeBSD, the current working directory of the shim should // On Windows and FreeBSD, the current working directory of the shim should
// not be the bundle path during the delete operation. Instead, we invoke // not be the bundle path during the delete operation. Instead, we invoke
// with the default work dir and forward the bundle path on the cmdline. // with the default work dir and forward the bundle path on the cmdline.
// Windows cannot delete the current working directory while an executable // Windows cannot delete the current working directory while an executable
// is in use with it. On FreeBSD, fork/exec can fail. // is in use with it. On FreeBSD, fork/exec can fail.