mirror of
https://github.com/docker/docs.git
synced 2026-11-05 00:14:17 +03:00
- Clear out some cruft tightly coupling libmachine to filestore - Comment out drivers other than virtualbox for now - Change way too many things - Mostly, break out the code to be more modular. - Destroy all traces of "provider" in its current form. It will be brought back as something more sensible, instead of something which overlaps in function with both Host and Store. - Fix mis-managed config passthru - Remove a few instances of state stored in env vars - This should be explicitly communicated in Go-land, not through the shell. - Rename "store" module to "persist" - This is done mostly to avoid confusion about the fact that a concrete instance of a "Store" interface is oftentimes referred to as "store" in the code. - Rip out repetitive antipattern for getting store - This replaces the previous repetive idiom for getting the cert info, and consequently the store, with a much less repetitive idiom. - Also, some redundant methods in commands.go for accessing hosts have either been simplified or removed entirely. - First steps towards fixing up tests - Test progress continues - Replace unit tests with integration tests - MAKE ALL UNIT TESTS PASS YAY - Add helper test files - Don't write to disk in libmachine/host - Heh.. coverage check strikes again - Fix remove code - Move cert code around - Continued progress: simplify Driver - Fixups and make creation work with new model - Move drivers module inside of libmachine - Move ssh module inside of libmachine - Move state module to libmachine - Move utils module to libmachine - Move version module to libmachine - Move log module to libmachine - Modify some constructor methods around - Change Travis build dep structure - Boring gofmt fix - Add version module - Move NewHost to store - Update some boring cert path infos to make API easier to use - Fix up some issues around the new model - Clean up some cert path stuff - Don't use shady functions to get store path :D - Continue artifact work - Fix silly machines dir bug - Continue fixing silly path issues - Change up output of vbm a bit - Continue work to make example go - Change output a little more - Last changes needed to make create finish properly - Fix config.go to use libmachine - Cut down code duplication and make both methods work with libmachine - Add pluggable logging implementation - Return error when machine already in desired state - Update example to show log method - Fix file:// bug - Fix Swarm defaults - Remove unused TLS settings from Engine and Swarm options - Remove spurious error - Correct bug detecting if migration was performed - Fix compilation errors from tests - Fix most of remaining test issues - Fix final silly bug in tests - Remove extraneous debug code - Add -race to test command - Appease the gofmt - Appease the generate coverage - Making executive decision to remove Travis coverage check In the early days I thought this would be a good idea because it would encourage people to write tests in case they added a new module. Well, in fact it has just turned into a giant nuisance and made refactoring work like this even more difficult. - Move Get to Load - Move HostListItem code to CLI Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
142 lines
3.2 KiB
Go
142 lines
3.2 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path"
|
|
"strconv"
|
|
|
|
"github.com/codegangsta/cli"
|
|
|
|
"github.com/docker/machine/commands"
|
|
"github.com/docker/machine/commands/mcndirs"
|
|
"github.com/docker/machine/libmachine/log"
|
|
"github.com/docker/machine/libmachine/ssh"
|
|
"github.com/docker/machine/version"
|
|
)
|
|
|
|
var AppHelpTemplate = `Usage: {{.Name}} {{if .Flags}}[OPTIONS] {{end}}COMMAND [arg...]
|
|
|
|
{{.Usage}}
|
|
|
|
Version: {{.Version}}{{if or .Author .Email}}
|
|
|
|
Author:{{if .Author}}
|
|
{{.Author}}{{if .Email}} - <{{.Email}}>{{end}}{{else}}
|
|
{{.Email}}{{end}}{{end}}
|
|
{{if .Flags}}
|
|
Options:
|
|
{{range .Flags}}{{.}}
|
|
{{end}}{{end}}
|
|
Commands:
|
|
{{range .Commands}}{{.Name}}{{with .ShortName}}, {{.}}{{end}}{{ "\t" }}{{.Usage}}
|
|
{{end}}
|
|
Run '{{.Name}} COMMAND --help' for more information on a command.
|
|
`
|
|
|
|
var CommandHelpTemplate = `Usage: docker-machine {{.Name}}{{if .Flags}} [OPTIONS]{{end}} [arg...]
|
|
|
|
{{.Usage}}{{if .Description}}
|
|
|
|
Description:
|
|
{{.Description}}{{end}}{{if .Flags}}
|
|
|
|
Options:
|
|
{{range .Flags}}
|
|
{{.}}{{end}}{{ end }}
|
|
`
|
|
|
|
func setDebugOutputLevel() {
|
|
// TODO: I'm not really a fan of this method and really would rather
|
|
// use -v / --verbose TBQH
|
|
for _, f := range os.Args {
|
|
if f == "-D" || f == "--debug" || f == "-debug" {
|
|
log.IsDebug = true
|
|
}
|
|
}
|
|
|
|
debugEnv := os.Getenv("MACHINE_DEBUG")
|
|
if debugEnv != "" {
|
|
showDebug, err := strconv.ParseBool(debugEnv)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "Error parsing boolean value from MACHINE_DEBUG: %s\n", err)
|
|
os.Exit(1)
|
|
}
|
|
log.IsDebug = showDebug
|
|
}
|
|
}
|
|
|
|
func main() {
|
|
setDebugOutputLevel()
|
|
cli.AppHelpTemplate = AppHelpTemplate
|
|
cli.CommandHelpTemplate = CommandHelpTemplate
|
|
app := cli.NewApp()
|
|
app.Name = path.Base(os.Args[0])
|
|
app.Author = "Docker Machine Contributors"
|
|
app.Email = "https://github.com/docker/machine"
|
|
app.Before = func(c *cli.Context) error {
|
|
if c.GlobalBool("native-ssh") {
|
|
ssh.SetDefaultClient(ssh.Native)
|
|
}
|
|
return nil
|
|
}
|
|
app.Commands = commands.Commands
|
|
app.CommandNotFound = cmdNotFound
|
|
app.Usage = "Create and manage machines running Docker."
|
|
app.Version = version.Version + " (" + version.GitCommit + ")"
|
|
|
|
app.Flags = []cli.Flag{
|
|
cli.BoolFlag{
|
|
Name: "debug, D",
|
|
Usage: "Enable debug mode",
|
|
},
|
|
cli.StringFlag{
|
|
EnvVar: "MACHINE_STORAGE_PATH",
|
|
Name: "s, storage-path",
|
|
Value: mcndirs.GetBaseDir(),
|
|
Usage: "Configures storage path",
|
|
},
|
|
cli.StringFlag{
|
|
EnvVar: "MACHINE_TLS_CA_CERT",
|
|
Name: "tls-ca-cert",
|
|
Usage: "CA to verify remotes against",
|
|
Value: "",
|
|
},
|
|
cli.StringFlag{
|
|
EnvVar: "MACHINE_TLS_CA_KEY",
|
|
Name: "tls-ca-key",
|
|
Usage: "Private key to generate certificates",
|
|
Value: "",
|
|
},
|
|
cli.StringFlag{
|
|
EnvVar: "MACHINE_TLS_CLIENT_CERT",
|
|
Name: "tls-client-cert",
|
|
Usage: "Client cert to use for TLS",
|
|
Value: "",
|
|
},
|
|
cli.StringFlag{
|
|
EnvVar: "MACHINE_TLS_CLIENT_KEY",
|
|
Name: "tls-client-key",
|
|
Usage: "Private key used in client TLS auth",
|
|
Value: "",
|
|
},
|
|
cli.BoolFlag{
|
|
EnvVar: "MACHINE_NATIVE_SSH",
|
|
Name: "native-ssh",
|
|
Usage: "Use the native (Go-based) SSH implementation.",
|
|
},
|
|
}
|
|
|
|
app.Run(os.Args)
|
|
}
|
|
|
|
func cmdNotFound(c *cli.Context, command string) {
|
|
log.Fatalf(
|
|
"%s: '%s' is not a %s command. See '%s --help'.",
|
|
c.App.Name,
|
|
command,
|
|
c.App.Name,
|
|
c.App.Name,
|
|
)
|
|
}
|