generate: Assorted namespace cleanups (add --user, no clobber, ...) #60
Conversation
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
wking
force-pushed
the
namespace-setup
branch
2 times, most recently
from
f595d37 to
77ed36a
Compare
If the template already has namespaces in it, we don't want to blow
them away in setupNamespaces. For example:
$ echo '{"linux": {"namespaces": [{"type": "pid"}]}}' >config-template.json
$ ocitools generate --template config-template.json --network=abc
$ jq .linux.namespaces config.json
[
{
"type": "pid"
},
{
"type": "network",
"path": "abc"
}
]
$ ocitools generate --template config-template.json
$ jq .linux.namespaces config.json
[
{
"type": "pid"
}
]
Signed-off-by: W. Trevor King <[email protected]>
And actively remove them if the PATH is the keyword "host". This helps with --template, because it's harder to get clean template round-trips if you have to opt-out of the namespace additions. The default template includes the non-user namespaces, so this commit doesn't effect the bare 'ocitools generate' output. Also document the PATH argument in ocitools-generate(1). I couldn't find a way to support '--network', etc. in codegangsta/cli, so the: --network=[PATH] and such are intentional. I would have preferred --network[=PATH], but using --network= instead of --network for "create a new network namespace" isn't that bad. Signed-off-by: W. Trevor King <[email protected]>
Put this in setupNamespaces with the other namespaces. This commit allows users to: * Join an existing user namespace with --user=path/to/ns. * Create a new user namespace without mapping IDs (although this is likely not very useful). * Clear a templated user namespace with --user=host (although without being able to clear the ID mappings, this may not be very useful). I haven't checked for likely-invalid configuration like: --uidmappings=1000:0:1 --user=path/to/ns We can add that in a follow-up commit if we want. Signed-off-by: W. Trevor King <[email protected]>
Contributor
|
Thanks! LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Details in the commit messages.