docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes cli arg bugs 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-02-03 12:44:06 -05:00
parent cdd891ce7c
commit 2f6d9a2418
No known key found for this signature in database
GPG Key ID: A519480096146526
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
commands.go
View File

@ -59,12 +59,7 @@ func (h hostListItemByName) Less(i, j int) bool {
return strings.ToLower(h[i].Name) < strings.ToLower(h[j].Name)
}
func beforeCreate(c *cli.Context) error {
caCertPath := c.GlobalString("tls-ca-cert")
caKeyPath := c.GlobalString("tls-ca-key")
clientCertPath := c.GlobalString("tls-client-cert")
clientKeyPath := c.GlobalString("tls-client-key")
func setupCertificates(caCertPath, caKeyPath, clientCertPath, clientKeyPath string) error {
org := utils.GetUsername()
bits := 2048
@ -129,7 +124,6 @@ var Commands = []cli.Command{
Action: cmdActive,
},
{
Before: beforeCreate,
Flags: append(
drivers.GetCreateFlags(),
cli.StringFlag{
@ -259,6 +253,11 @@ func cmdCreate(c *cli.Context) {
log.Fatal("You must specify a machine name")
}
if err := setupCertificates(c.GlobalString("tls-ca-cert"), c.GlobalString("tls-ca-key"),
c.GlobalString("tls-client-cert"), c.GlobalString("tls-client-key")); err != nil {
log.Fatalf("Error generating certificates: %s", err)
}
store := NewStore(c.GlobalString("storage-path"), c.GlobalString("tls-ca-cert"), c.GlobalString("tls-ca-key"))
host, err := store.Create(name, driver, c)