mirror of https://github.com/docker/docs.git
Merge pull request #233 from nathanleclaire/funccmds
Move closures to be named functions
This commit is contained in:
Evan Hazlett
commit
68c80b5ae6
502
commands.go
502
commands.go
|
|
@ -46,33 +46,9 @@ func (h hostListItemByName) Less(i, j int) bool {
|
|||
|
||||
var Commands = []cli.Command{
|
||||
{
|
||||
Name: "active",
|
||||
Usage: "Get or set the active machine",
|
||||
Action: func(c *cli.Context) {
|
||||
name := c.Args().First()
|
||||
store := NewStore(c.GlobalString("storage-path"))
|
||||
|
||||
if name == "" {
|
||||
host, err := store.GetActive()
|
||||
if err != nil {
|
||||
log.Fatalf("error getting active host: %v", err)
|
||||
}
|
||||
if host != nil {
|
||||
fmt.Println(host.Name)
|
||||
}
|
||||
} else if name != "" {
|
||||
host, err := store.Load(name)
|
||||
if err != nil {
|
||||
log.Fatalf("error loading host: %v", err)
|
||||
}
|
||||
|
||||
if err := store.SetActive(host); err != nil {
|
||||
log.Fatalf("error setting active host: %v", err)
|
||||
}
|
||||
} else {
|
||||
cli.ShowCommandHelp(c, "active")
|
||||
}
|
||||
},
|
||||
Name: "active",
|
||||
Usage: "Get or set the active machine",
|
||||
Action: cmdActive,
|
||||
},
|
||||
{
|
||||
Flags: append(
|
||||
|
|
@ -86,71 +62,24 @@ var Commands = []cli.Command{
|
|||
Value: "none",
|
||||
},
|
||||
),
|
||||
Name: "create",
|
||||
Usage: "Create a machine",
|
||||
Action: func(c *cli.Context) {
|
||||
driver := c.String("driver")
|
||||
name := c.Args().First()
|
||||
|
||||
if name == "" {
|
||||
cli.ShowCommandHelp(c, "create")
|
||||
log.Fatal("You must specify a machine name")
|
||||
}
|
||||
|
||||
keyExists, err := drivers.PublicKeyExists()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
if !keyExists {
|
||||
log.Fatalf("Identity authentication public key doesn't exist at %q. Create your public key by running the \"docker\" command.", drivers.PublicKeyPath())
|
||||
}
|
||||
|
||||
store := NewStore(c.GlobalString("storage-path"))
|
||||
|
||||
host, err := store.Create(name, driver, c)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
if err := store.SetActive(host); err != nil {
|
||||
log.Fatalf("error setting active host: %v", err)
|
||||
}
|
||||
|
||||
log.Infof("%q has been created and is now the active machine. To point Docker at this machine, run: export DOCKER_HOST=$(machine url) DOCKER_AUTH=identity", name)
|
||||
},
|
||||
Name: "create",
|
||||
Usage: "Create a machine",
|
||||
Action: cmdCreate,
|
||||
},
|
||||
{
|
||||
Name: "inspect",
|
||||
Usage: "Inspect information about a machine",
|
||||
Action: func(c *cli.Context) {
|
||||
prettyJSON, err := json.MarshalIndent(getHost(c), "", " ")
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
fmt.Println(string(prettyJSON))
|
||||
},
|
||||
Name: "inspect",
|
||||
Usage: "Inspect information about a machine",
|
||||
Action: cmdInspect,
|
||||
},
|
||||
{
|
||||
Name: "ip",
|
||||
Usage: "Get the IP address of a machine",
|
||||
Action: func(c *cli.Context) {
|
||||
ip, err := getHost(c).Driver.GetIP()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
fmt.Println(ip)
|
||||
},
|
||||
Name: "ip",
|
||||
Usage: "Get the IP address of a machine",
|
||||
Action: cmdIp,
|
||||
},
|
||||
{
|
||||
Name: "kill",
|
||||
Usage: "Kill a machine",
|
||||
Action: func(c *cli.Context) {
|
||||
if err := getHost(c).Driver.Kill(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
},
|
||||
Name: "kill",
|
||||
Usage: "Kill a machine",
|
||||
Action: cmdKill,
|
||||
},
|
||||
{
|
||||
Flags: []cli.Flag{
|
||||
|
|
@ -159,64 +88,14 @@ var Commands = []cli.Command{
|
|||
Usage: "Enable quiet mode",
|
||||
},
|
||||
},
|
||||
Name: "ls",
|
||||
Usage: "List machines",
|
||||
Action: func(c *cli.Context) {
|
||||
quiet := c.Bool("quiet")
|
||||
store := NewStore(c.GlobalString("storage-path"))
|
||||
|
||||
hostList, err := store.List()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
w := tabwriter.NewWriter(os.Stdout, 5, 1, 3, ' ', 0)
|
||||
|
||||
if !quiet {
|
||||
fmt.Fprintln(w, "NAME\tACTIVE\tDRIVER\tSTATE\tURL")
|
||||
}
|
||||
|
||||
items := []hostListItem{}
|
||||
hostListItems := make(chan hostListItem)
|
||||
|
||||
for _, host := range hostList {
|
||||
if !quiet {
|
||||
go getHostState(host, *store, hostListItems)
|
||||
} else {
|
||||
fmt.Fprintf(w, "%s\n", host.Name)
|
||||
}
|
||||
}
|
||||
|
||||
if !quiet {
|
||||
for i := 0; i < len(hostList); i++ {
|
||||
items = append(items, <-hostListItems)
|
||||
}
|
||||
}
|
||||
|
||||
close(hostListItems)
|
||||
|
||||
sort.Sort(hostListItemByName(items))
|
||||
|
||||
for _, item := range items {
|
||||
activeString := ""
|
||||
if item.Active {
|
||||
activeString = "*"
|
||||
}
|
||||
fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n",
|
||||
item.Name, activeString, item.DriverName, item.State, item.URL)
|
||||
}
|
||||
|
||||
w.Flush()
|
||||
},
|
||||
Name: "ls",
|
||||
Usage: "List machines",
|
||||
Action: cmdLs,
|
||||
},
|
||||
{
|
||||
Name: "restart",
|
||||
Usage: "Restart a machine",
|
||||
Action: func(c *cli.Context) {
|
||||
if err := getHost(c).Driver.Restart(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
},
|
||||
Name: "restart",
|
||||
Usage: "Restart a machine",
|
||||
Action: cmdRestart,
|
||||
},
|
||||
{
|
||||
Flags: []cli.Flag{
|
||||
|
|
@ -225,29 +104,9 @@ var Commands = []cli.Command{
|
|||
Usage: "Remove local configuration even if machine cannot be removed",
|
||||
},
|
||||
},
|
||||
Name: "rm",
|
||||
Usage: "Remove a machine",
|
||||
Action: func(c *cli.Context) {
|
||||
if len(c.Args()) == 0 {
|
||||
cli.ShowCommandHelp(c, "rm")
|
||||
log.Fatal("You must specify a machine name")
|
||||
}
|
||||
|
||||
force := c.Bool("force")
|
||||
|
||||
isError := false
|
||||
|
||||
store := NewStore(c.GlobalString("storage-path"))
|
||||
for _, host := range c.Args() {
|
||||
if err := store.Remove(host, force); err != nil {
|
||||
log.Errorf("Error removing machine %s: %s", host, err)
|
||||
isError = true
|
||||
}
|
||||
}
|
||||
if isError {
|
||||
log.Fatal("There was an error removing a machine. To force remove it, pass the -f option. Warning: this might leave it running on the provider.")
|
||||
}
|
||||
},
|
||||
Name: "rm",
|
||||
Usage: "Remove a machine",
|
||||
Action: cmdRm,
|
||||
},
|
||||
{
|
||||
Flags: []cli.Flag{
|
||||
|
|
@ -257,88 +116,255 @@ var Commands = []cli.Command{
|
|||
Value: "",
|
||||
},
|
||||
},
|
||||
Name: "ssh",
|
||||
Usage: "Log into or run a command on a machine with SSH",
|
||||
Action: func(c *cli.Context) {
|
||||
name := c.Args().First()
|
||||
store := NewStore(c.GlobalString("storage-path"))
|
||||
|
||||
if name == "" {
|
||||
host, err := store.GetActive()
|
||||
if err != nil {
|
||||
log.Fatalf("unable to get active host: %v", err)
|
||||
}
|
||||
|
||||
name = host.Name
|
||||
}
|
||||
|
||||
i := 1
|
||||
for i < len(os.Args) && os.Args[i-1] != name {
|
||||
i++
|
||||
}
|
||||
|
||||
host, err := store.Load(name)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
var sshCmd *exec.Cmd
|
||||
if c.String("command") == "" {
|
||||
sshCmd, err = host.Driver.GetSSHCommand()
|
||||
} else {
|
||||
sshCmd, err = host.Driver.GetSSHCommand(c.String("command"))
|
||||
}
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
sshCmd.Stdin = os.Stdin
|
||||
sshCmd.Stdout = os.Stdout
|
||||
sshCmd.Stderr = os.Stderr
|
||||
if err := sshCmd.Run(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
},
|
||||
Name: "ssh",
|
||||
Usage: "Log into or run a command on a machine with SSH",
|
||||
Action: cmdSsh,
|
||||
},
|
||||
{
|
||||
Name: "start",
|
||||
Usage: "Start a machine",
|
||||
Action: func(c *cli.Context) {
|
||||
if err := getHost(c).Start(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
},
|
||||
Name: "start",
|
||||
Usage: "Start a machine",
|
||||
Action: cmdStart,
|
||||
},
|
||||
{
|
||||
Name: "stop",
|
||||
Usage: "Stop a machine",
|
||||
Action: func(c *cli.Context) {
|
||||
if err := getHost(c).Stop(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
},
|
||||
Name: "stop",
|
||||
Usage: "Stop a machine",
|
||||
Action: cmdStop,
|
||||
},
|
||||
{
|
||||
Name: "upgrade",
|
||||
Usage: "Upgrade a machine to the latest version of Docker",
|
||||
Action: func(c *cli.Context) {
|
||||
if err := getHost(c).Upgrade(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
},
|
||||
Name: "upgrade",
|
||||
Usage: "Upgrade a machine to the latest version of Docker",
|
||||
Action: cmdUpgrade,
|
||||
},
|
||||
{
|
||||
Name: "url",
|
||||
Usage: "Get the URL of a machine",
|
||||
Action: func(c *cli.Context) {
|
||||
url, err := getHost(c).GetURL()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
Name: "url",
|
||||
Usage: "Get the URL of a machine",
|
||||
Action: cmdUrl,
|
||||
},
|
||||
}
|
||||
|
||||
fmt.Println(url)
|
||||
},
|
||||
},
|
||||
func cmdActive(c *cli.Context) {
|
||||
name := c.Args().First()
|
||||
store := NewStore(c.GlobalString("storage-path"))
|
||||
|
||||
if name == "" {
|
||||
host, err := store.GetActive()
|
||||
if err != nil {
|
||||
log.Fatalf("error getting active host: %v", err)
|
||||
}
|
||||
if host != nil {
|
||||
fmt.Println(host.Name)
|
||||
}
|
||||
} else if name != "" {
|
||||
host, err := store.Load(name)
|
||||
if err != nil {
|
||||
log.Fatalf("error loading host: %v", err)
|
||||
}
|
||||
|
||||
if err := store.SetActive(host); err != nil {
|
||||
log.Fatalf("error setting active host: %v", err)
|
||||
}
|
||||
} else {
|
||||
cli.ShowCommandHelp(c, "active")
|
||||
}
|
||||
}
|
||||
|
||||
func cmdCreate(c *cli.Context) {
|
||||
driver := c.String("driver")
|
||||
name := c.Args().First()
|
||||
|
||||
if name == "" {
|
||||
cli.ShowCommandHelp(c, "create")
|
||||
log.Fatal("You must specify a machine name")
|
||||
}
|
||||
|
||||
keyExists, err := drivers.PublicKeyExists()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
if !keyExists {
|
||||
log.Fatalf("Identity authentication public key doesn't exist at %q. Create your public key by running the \"docker\" command.", drivers.PublicKeyPath())
|
||||
}
|
||||
|
||||
store := NewStore(c.GlobalString("storage-path"))
|
||||
|
||||
host, err := store.Create(name, driver, c)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
if err := store.SetActive(host); err != nil {
|
||||
log.Fatalf("error setting active host: %v", err)
|
||||
}
|
||||
|
||||
log.Infof("%q has been created and is now the active machine. To point Docker at this machine, run: export DOCKER_HOST=$(machine url) DOCKER_AUTH=identity", name)
|
||||
}
|
||||
|
||||
func cmdInspect(c *cli.Context) {
|
||||
prettyJSON, err := json.MarshalIndent(getHost(c), "", " ")
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
fmt.Println(string(prettyJSON))
|
||||
}
|
||||
|
||||
func cmdIp(c *cli.Context) {
|
||||
ip, err := getHost(c).Driver.GetIP()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
fmt.Println(ip)
|
||||
}
|
||||
|
||||
func cmdKill(c *cli.Context) {
|
||||
if err := getHost(c).Driver.Kill(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func cmdLs(c *cli.Context) {
|
||||
quiet := c.Bool("quiet")
|
||||
store := NewStore(c.GlobalString("storage-path"))
|
||||
|
||||
hostList, err := store.List()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
w := tabwriter.NewWriter(os.Stdout, 5, 1, 3, ' ', 0)
|
||||
|
||||
if !quiet {
|
||||
fmt.Fprintln(w, "NAME\tACTIVE\tDRIVER\tSTATE\tURL")
|
||||
}
|
||||
|
||||
items := []hostListItem{}
|
||||
hostListItems := make(chan hostListItem)
|
||||
|
||||
for _, host := range hostList {
|
||||
if !quiet {
|
||||
go getHostState(host, *store, hostListItems)
|
||||
} else {
|
||||
fmt.Fprintf(w, "%s\n", host.Name)
|
||||
}
|
||||
}
|
||||
|
||||
if !quiet {
|
||||
for i := 0; i < len(hostList); i++ {
|
||||
items = append(items, <-hostListItems)
|
||||
}
|
||||
}
|
||||
|
||||
close(hostListItems)
|
||||
|
||||
sort.Sort(hostListItemByName(items))
|
||||
|
||||
for _, item := range items {
|
||||
activeString := ""
|
||||
if item.Active {
|
||||
activeString = "*"
|
||||
}
|
||||
fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n",
|
||||
item.Name, activeString, item.DriverName, item.State, item.URL)
|
||||
}
|
||||
|
||||
w.Flush()
|
||||
}
|
||||
|
||||
func cmdRestart(c *cli.Context) {
|
||||
if err := getHost(c).Driver.Restart(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func cmdRm(c *cli.Context) {
|
||||
if len(c.Args()) == 0 {
|
||||
cli.ShowCommandHelp(c, "rm")
|
||||
log.Fatal("You must specify a machine name")
|
||||
}
|
||||
|
||||
force := c.Bool("force")
|
||||
|
||||
isError := false
|
||||
|
||||
store := NewStore(c.GlobalString("storage-path"))
|
||||
for _, host := range c.Args() {
|
||||
if err := store.Remove(host, force); err != nil {
|
||||
log.Errorf("Error removing machine %s: %s", host, err)
|
||||
isError = true
|
||||
}
|
||||
}
|
||||
if isError {
|
||||
log.Fatal("There was an error removing a machine. To force remove it, pass the -f option. Warning: this might leave it running on the provider.")
|
||||
}
|
||||
}
|
||||
|
||||
func cmdSsh(c *cli.Context) {
|
||||
name := c.Args().First()
|
||||
store := NewStore(c.GlobalString("storage-path"))
|
||||
|
||||
if name == "" {
|
||||
host, err := store.GetActive()
|
||||
if err != nil {
|
||||
log.Fatalf("unable to get active host: %v", err)
|
||||
}
|
||||
|
||||
name = host.Name
|
||||
}
|
||||
|
||||
i := 1
|
||||
for i < len(os.Args) && os.Args[i-1] != name {
|
||||
i++
|
||||
}
|
||||
|
||||
host, err := store.Load(name)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
var sshCmd *exec.Cmd
|
||||
if c.String("command") == "" {
|
||||
sshCmd, err = host.Driver.GetSSHCommand()
|
||||
} else {
|
||||
sshCmd, err = host.Driver.GetSSHCommand(c.String("command"))
|
||||
}
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
sshCmd.Stdin = os.Stdin
|
||||
sshCmd.Stdout = os.Stdout
|
||||
sshCmd.Stderr = os.Stderr
|
||||
if err := sshCmd.Run(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func cmdStart(c *cli.Context) {
|
||||
if err := getHost(c).Start(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func cmdStop(c *cli.Context) {
|
||||
if err := getHost(c).Stop(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func cmdUpgrade(c *cli.Context) {
|
||||
if err := getHost(c).Upgrade(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func cmdUrl(c *cli.Context) {
|
||||
url, err := getHost(c).GetURL()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
fmt.Println(url)
|
||||
}
|
||||
|
||||
func getHost(c *cli.Context) *Host {
|
||||
|
|
|
|||
Loading…
Reference in New Issue