dockerd-rootless-setuptool.sh: add nsenter subcommand (for debugging)
#47084
Conversation
This file contains 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
AkihiroSuda
changed the title
nsenter subcommandnsenter subcommand (for debugging)
AkihiroSuda
force-pushed
the
dockerd-rootless-setuptool-nsenter
branch
2 times, most recently
from
623b25f
to
3273731
Compare
|
Some failures; not sure if related in any way; perhaps you could try a rebase to get a fresh run? |
AkihiroSuda
force-pushed
the
dockerd-rootless-setuptool-nsenter
branch
from
3273731
to
054ad0a
Compare
AkihiroSuda
force-pushed
the
dockerd-rootless-setuptool-nsenter
branch
from
054ad0a
to
4bf86fb
Compare
XDG_RUNTIME_DIR will contain sockets so its path mustn't be too long. Prior to this commit, it was set to very long path like `/go/src/github.com/docker/docker/bundles/test-integration/TestDiskUsage/de4fb36576d7d/xdgrun` Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Now the state dir is set to `${XDG_RUNTIME_DIR}/dockerd-rootless`.
This is similar to `${XDG_RUNTIME_DIR}/containerd-rootless` used in nerdctl:
https://github.com/containerd/nerdctl/blob/v1.7.2/extras/rootless/containerd-rootless.sh#L35
Prior to this commit, the state dir was unset and a random dir under `/tmp` was used.
(e.g., `/tmp/rootlesskit1869901982`)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Usage: `dockerd-rootless-setuptool.sh nsenter -- ip a` Expected to be used for debugging. Ported from nerdctl's `containerd-rootless-setuptool.sh` https://github.com/containerd/nerdctl/blob/v1.7.2/extras/rootless/containerd-rootless-setuptool.sh#L142-L147 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
AkihiroSuda
force-pushed
the
dockerd-rootless-setuptool-nsenter
branch
from
4bf86fb
to
84d2229
Compare
|
Now CI is green (I had to add testutil/daemon: shorten XDG_RUNTIME_DIR) |
|
Arf.. those "too long" paths keep on coming back. Perhaps something we should look into at some point (maybe use some short temp-dir somewhere for test-daemons to put the socket in). In either case, that's a separate concern, good for handling separate / follow up work. |
thaJeztah
added
the
kind/enhancement
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
- What I did
Added
nsentersubcommand todockerd-rootless-setuptool.sh.Expected to be used for debugging.
- How I did it
Ported
containerd-rootless-setuptool.sh nsenter(part of nerdctl) todockerd-rootless-setuptool.shhttps://github.com/containerd/nerdctl/blob/v1.7.2/extras/rootless/containerd-rootless-setuptool.sh#L142-L147
- How to verify it
- Description for the changelog
dockerd-rootless-setuptool.sh: add
nsentersubcommand (for debugging)- A picture of a cute animal (not mandatory but encouraged)
馃惂