[pull] main from containerd:main#272
Merged
pull[bot] merged 8 commits intomeonBot:mainfrom Mar 18, 2026
Merged
Conversation
Currently the tests fail on Linux:
```
--- FAIL: TestNewSocket (0.00s)
--- FAIL: TestNewSocket/socket_in_nested_directory (0.00s)
util_unix_test.go:42: NewSocket failed: mkdir failed for /tmp/shim-test-1791693890/a/b/test.sock: mkdir /tmp/shim-test-1791693890/a/b: permission denied
FAIL
FAIL github.com/containerd/containerd/v2/pkg/shim 0.004s
FAIL
```
This is fixed by the next commit.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
NewSocket was using the same permission mode (0600) for both the socket file and its parent directory. Directories require the execute bit to be traversable, so creating a directory with 0600 prevents any files from being created inside it. Use 0700 for directory creation while keeping 0600 for socket files. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
The executable bit is needed only for the parent directory, not the socket itself. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Signed-off-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Derek McGowan <derek@mcg.dev>
pkg/shim: Fix NewSocket directory permissions
Prepare release notes for v2.3.0-beta.0
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )