[integration-test] merge master

Author: Jimmy-Xu

README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/hyperhq/hypercli.svg?branch=master)](https://travis-ci.org/hyperhq/hypercli)
 
-Hyper_ client for Mac/Linux
+Hyper.sh client for Mac/Linux
 
 How to build
 ```

VERSION

@@ -1 +1 @@
-1.10.2
+1.10.12

api/client/cli.go

@@ -83,6 +83,12 @@ func (cli *DockerCli) ImagesFormat() string {
 	return cli.configFile.ImagesFormat
 }
 
+// VolumesFormat returns the format string specified in the configuration.
+// String contains columns and format specification, for example {{ID}}\t{{Name}}.
+func (cli *DockerCli) VolumesFormat() string {
+	return cli.configFile.VolumesFormat
+}
+
 func (cli *DockerCli) setRawTerminal() error {
 	if cli.isTerminalIn && os.Getenv("NORAW") == "" {
 		state, err := term.SetRawTerminal(cli.inFd)
@@ -153,6 +159,9 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
 		if ok {
 			cloudConfig.AccessKey = cc.AccessKey
 			cloudConfig.SecretKey = cc.SecretKey
+		} else {
+			cloudConfig.AccessKey = os.Getenv("HYPER_ACCESS")
+			cloudConfig.SecretKey = os.Getenv("HYPER_SECRET")
 		}
 		if cloudConfig.AccessKey == "" || cloudConfig.SecretKey == "" {
 			fmt.Fprintf(cli.err, "WARNING: null cloud config\n")

api/client/commit.go

@@ -4,27 +4,26 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"golang.org/x/net/context"
-
 	"github.com/docker/engine-api/types"
 	"github.com/docker/engine-api/types/container"
 	Cli "github.com/hyperhq/hypercli/cli"
 	"github.com/hyperhq/hypercli/opts"
 	flag "github.com/hyperhq/hypercli/pkg/mflag"
+	"golang.org/x/net/context"
 )
 
 // CmdCommit creates a new image from a container's changes.
 //
-// Usage: docker commit [OPTIONS] CONTAINER [REPOSITORY[:TAG]]
-func (cli *DockerCli) Commit(args ...string) error {
+// Usage: hyper commit [OPTIONS] CONTAINER [REPOSITORY[:TAG]]
+func (cli *DockerCli) CmdCommit(args ...string) error {
 	cmd := Cli.Subcmd("commit", []string{"CONTAINER [REPOSITORY[:TAG]]"}, Cli.DockerCommands["commit"].Description, true)
-	flPause := cmd.Bool([]string{"p", "-pause"}, true, "Pause container during commit")
+	flPause := cmd.Bool([]string{}, true, "Pause container during commit")
 	flComment := cmd.String([]string{"m", "-message"}, "", "Commit message")
 	flAuthor := cmd.String([]string{"a", "-author"}, "", "Author (e.g., \"John Hannibal Smith <hannibal@a-team.com>\")")
 	flChanges := opts.NewListOpts(nil)
 	cmd.Var(&flChanges, []string{"c", "-change"}, "Apply Dockerfile instruction to the created image")
 	// FIXME: --run is deprecated, it will be replaced with inline Dockerfile commands.
-	flConfig := cmd.String([]string{"#-run"}, "", "This option is deprecated and will be removed in a future version in favor of inline Dockerfile-compatible commands")
+	flConfig := cmd.String([]string{}, "", "This option is deprecated and will be removed in a future version in favor of inline Dockerfile-compatible commands")
 	cmd.Require(flag.Max, 2)
 	cmd.Require(flag.Min, 1)
 

api/client/compose.go

@@ -11,6 +11,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/engine-api/client"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 	Cli "github.com/hyperhq/hypercli/cli"
 	"github.com/hyperhq/hypercli/pkg/jsonmessage"
 	flag "github.com/hyperhq/hypercli/pkg/mflag"
@@ -21,6 +23,8 @@ import (
 	"golang.org/x/net/context"
 )
 
+const ComposeFipAuto = "auto"
+
 // CmdCompose is the parent subcommand for all compose commands
 //
 // Usage: hyper compose <COMMAND> [OPTIONS]
@@ -53,6 +57,7 @@ func (cli *DockerCli) CmdComposeRun(args ...string) error {
 		Context: project.Context{
 			ComposeFiles: []string{*composeFile},
 			ProjectName:  *projectName,
+			Autoremove:   *rm,
 		},
 		ClientFactory: cli,
 	})
@@ -65,15 +70,15 @@ func (cli *DockerCli) CmdComposeRun(args ...string) error {
 	if err != nil {
 		return err
 	}
-	if status != 0 {
-		return Cli.StatusError{StatusCode: status}
-	}
 	if *rm {
 		opts := options.Delete{RemoveVolume: true}
 		if err = project.Delete(opts, service); err != nil {
 			return err
 		}
 	}
+	if status != 0 {
+		return Cli.StatusError{StatusCode: status}
+	}
 
 	return nil
 }
@@ -152,6 +157,45 @@ func (cli *DockerCli) CmdComposeUp(args ...string) error {
 	if *projectName == "" {
 		*projectName = getBaseDir()
 	}
+	var fips = []string{}
+	var newFipNum = 0
+	for _, svconfig := range c.M {
+		if svconfig.Fip == ComposeFipAuto {
+			newFipNum++
+		}
+	}
+	fipFilterArgs, _ := filters.FromParam("dangling=true")
+	options := types.NetworkListOptions{
+		Filters: fipFilterArgs,
+	}
+	fipList, err := cli.client.FipList(context.Background(), options)
+	if err == nil {
+		for _, fip := range fipList {
+			if fip["container"] == "" && fip["service"] == "" {
+				fips = append(fips, fip["fip"])
+			}
+		}
+	}
+	if newFipNum > len(fips) {
+		if askForConfirmation(warnMessage) == true {
+			newFips, err := cli.client.FipAllocate(context.Background(), fmt.Sprintf("%d", newFipNum-len(fips)))
+			if err != nil {
+				return err
+			}
+			fips = append(fips, newFips...)
+		}
+	}
+	i := 0
+	for _, svconfig := range c.M {
+		if svconfig.Fip == ComposeFipAuto {
+			if i >= newFipNum {
+				svconfig.Fip = ""
+			} else {
+				svconfig.Fip = fips[i]
+				i++
+			}
+		}
+	}
 	body, err := cli.client.ComposeUp(*projectName, services, c, vc, nc, cli.configFile.AuthConfigs, *forcerecreate, *norecreate)
 	if err != nil {
 		return err
@@ -409,12 +453,41 @@ func (cli *DockerCli) CmdComposeScale(args ...string) error {
 	return nil
 }
 
+// CmdComposePull
+//
+// Usage: hyper compose pull [OPTIONS]
+func (cli *DockerCli) CmdComposePull(args ...string) error {
+	cmd := Cli.Subcmd("compose pull", []string{"[SERVICE...]"}, "Pull images of services.", false)
+	composeFile := cmd.String([]string{"f", "-file"}, "docker-compose.yml", "Specify an alternate compose file")
+	cmd.Require(flag.Min, 0)
+	err := cmd.ParseFlags(args, true)
+	if err != nil {
+		return err
+	}
+	project, err := docker.NewProject(&docker.Context{
+		Context: project.Context{
+			ComposeFiles: []string{*composeFile},
+		},
+		ClientFactory: cli,
+	})
+
+	if err != nil {
+		return err
+	}
+	err = project.Pull(cmd.Args()...)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func composeUsage() string {
 	composeCommands := [][]string{
 		{"create", "Creates containers for a service"},
 		{"down", "Stop and remove containers, images, and volumes"},
 		{"kill", "Force stop service containers"},
 		{"ps", "List containers"},
+		{"pull", "Pull images of services"},
 		{"rm", "Remove stopped service containers"},
 		{"run", "Run a one-off command"},
 		{"scale", "Set number of containers for a service"},

api/client/create.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"golang.org/x/net/context"
@@ -87,6 +88,8 @@ func parseProtoAndLocalBind(bind string) (string, string, bool) {
 		if strings.Count(bind, ":") < 1 {
 			return "", "", false
 		}
+	case filepath.VolumeName(bind) != "":
+		// Windows local path
 	default:
 		return "", "", false
 	}
@@ -165,7 +168,7 @@ func (cli *DockerCli) createContainer(ctx context.Context, config *container.Con
 	//if image not found try to pull it
 	if err != nil {
 		if client.IsErrImageNotFound(err) {
-			fmt.Fprintf(cli.err, "Unable to find image '%s' locally\n", ref.String())
+			fmt.Fprintf(cli.err, "Unable to find image '%s' in the current region\n", ref.String())
 
 			// we don't want to write to stdout anything apart from container.ID
 			if err = cli.pullImageCustomOut(ctx, config.Image, cli.err); err != nil {