mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
Remove --create from nsinit and make it default
More people are using this to test new features and this makes it very simple to run a container with a simple command. `nsinit exec --tty sh` Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
+1
-2
@@ -24,8 +24,7 @@ var execCommand = cli.Command{
|
||||
Flags: append([]cli.Flag{
|
||||
cli.BoolFlag{Name: "tty,t", Usage: "allocate a TTY to the container"},
|
||||
cli.StringFlag{Name: "id", Value: "nsinit", Usage: "specify the ID for a container"},
|
||||
cli.StringFlag{Name: "config", Value: "container.json", Usage: "path to the configuration file"},
|
||||
cli.BoolFlag{Name: "create", Usage: "create the container's configuration on the fly with arguments"},
|
||||
cli.StringFlag{Name: "config", Value: "", Usage: "path to the configuration file"},
|
||||
cli.StringFlag{Name: "user,u", Value: "root", Usage: "set the user, uid, and/or gid for the process"},
|
||||
cli.StringFlag{Name: "cwd", Value: "", Usage: "set the current working dir"},
|
||||
cli.StringSliceFlag{Name: "env", Value: standardEnvironment, Usage: "set environment variables for the process"},
|
||||
|
||||
+12
-12
@@ -11,20 +11,20 @@ import (
|
||||
)
|
||||
|
||||
func loadConfig(context *cli.Context) (*configs.Config, error) {
|
||||
if context.Bool("create") {
|
||||
config := getTemplate()
|
||||
modify(config, context)
|
||||
if path := context.String("config"); path != "" {
|
||||
f, err := os.Open(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
var config *configs.Config
|
||||
if err := json.NewDecoder(f).Decode(&config); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return config, nil
|
||||
}
|
||||
f, err := os.Open(context.String("config"))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
var config *configs.Config
|
||||
if err := json.NewDecoder(f).Decode(&config); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
config := getTemplate()
|
||||
modify(config, context)
|
||||
return config, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user