Merge branch 'master' into integration-test

Author: Jimmy-Xu

.travis.yml

@@ -8,4 +8,4 @@ matrix:
     - go: 1.5
 
 script:
-  - ./build-hyperserve-client.sh
+  - ./build.sh

README.md

@@ -8,5 +8,5 @@ $ mkdir $GOPATH/src/github.com/hyperhq/
 $ cd $GOPATH/src/github.com/hyperhq/
 $ git clone https://github.com/hyperhq/hypercli hypercli
 $ cd hypercli
-$ ./build-hyperserve-client.sh
+$ ./build.sh
 ```

api/client/exec.go

@@ -198,7 +198,7 @@ func (cli *DockerCli) WaitExec(execID string) error {
 		case running:
 			time.Sleep(100 * time.Millisecond)
 		case status != 0:
-			err = fmt.Errorf("Failed to init volume: %d", status)
+			err = fmt.Errorf("Failed to exec cmd: %d", status)
 			return err
 		case status == 0:
 			return nil

api/client/fip.go

@@ -146,7 +146,7 @@ func fipUsage() string {
 	fipCommands := map[string]string{
 		"allocate":     "Allocate a or some IPs",
 		"associate":    "Associate floating IP to container",
-		"disassociate": "Disassociate floating IP from conainer",
+		"disassociate": "Disassociate floating IP from container",
 		"ls":           "List all floating IPs",
 		"release":      "Release a floating IP",
 	}

api/client/kill.go

@@ -13,7 +13,7 @@ import (
 // Usage: docker kill [OPTIONS] CONTAINER [CONTAINER...]
 func (cli *DockerCli) CmdKill(args ...string) error {
 	cmd := Cli.Subcmd("kill", []string{"CONTAINER [CONTAINER...]"}, Cli.DockerCommands["kill"].Description, true)
-	signal := cmd.String([]string{}, "KILL", "Signal to send to the container")
+	signal := cmd.String([]string{"s", "-signal"}, "KILL", "Signal to send to the container")
 	cmd.Require(flag.Min, 1)
 
 	cmd.ParseFlags(args, true)

api/client/run.go

@@ -118,7 +118,8 @@ func checkSourceType(source string) string {
 
 func (cli *DockerCli) initSpecialVolumes(config *container.Config, hostConfig *container.HostConfig, networkingConfig *networktypes.NetworkingConfig, initvols []*InitVolume) error {
 	const INIT_VOLUME_PATH = "/vol/"
-	const INIT_VOLUME_IMAGE = "hyperhq/volume_uploader:latest"
+	const INIT_VOLUME_IMAGE = "hyperhq/volume_uploader:v1"
+	const INIT_VOLUME_FILENAME = ".hyper_file_volume_data_do_not_create_on_your_own"
 	var (
 		initConfig     *container.Config
 		initHostConfig *container.HostConfig
@@ -176,9 +177,21 @@ func (cli *DockerCli) initSpecialVolumes(config *container.Config, hostConfig *c
 		case "git":
 			cmd = append(cmd, "git", "clone", vol.Source, INIT_VOLUME_PATH+vol.Destination)
 		case "http":
+			isFile, err := fileSourceVolume(vol.Source)
+			if err != nil {
+				return err
+			}
 			parts := strings.Split(vol.Source, "/")
-			cmd = append(cmd, "wget", "--no-check-certificate", "--tries=5", "--mirror", "--no-host-directories", "--cut-dirs="+strconv.Itoa(len(parts)), vol.Source, "--directory-prefix="+INIT_VOLUME_PATH+vol.Destination)
+			if isFile {
+				cmd = append(cmd, "wget", "--no-check-certificate", "--tries=5", vol.Source, "--output-document="+INIT_VOLUME_PATH+vol.Destination+"/"+INIT_VOLUME_FILENAME)
+			} else {
+				cmd = append(cmd, "wget", "--no-check-certificate", "--tries=5", "--mirror", "--no-host-directories", "--cut-dirs="+strconv.Itoa(len(parts)), vol.Source, "--directory-prefix="+INIT_VOLUME_PATH+vol.Destination)
+			}
 		case "local":
+			isFile, err := fileSourceVolume(vol.Source)
+			if err != nil {
+				return err
+			}
 			execCount++
 			if fip == "" {
 				fip, err = cli.associateNewFip(createResponse.ID)
@@ -187,7 +200,11 @@ func (cli *DockerCli) initSpecialVolumes(config *container.Config, hostConfig *c
 				}
 			}
 			go func(vol *InitVolume) {
-				err := cli.uploadLocalResource(vol.Source, INIT_VOLUME_PATH+vol.Destination, fip, "root", passwd.String())
+				dest := INIT_VOLUME_PATH + vol.Destination
+				if isFile {
+					dest = dest + "/" + INIT_VOLUME_FILENAME
+				}
+				err := cli.uploadLocalResource(vol.Source, dest, fip, "root", passwd.String(), isFile)
 				if err != nil {
 					err = fmt.Errorf("Failed to upload %s: %s", vol.Source, err.Error())
 				}
@@ -245,6 +262,38 @@ func (cli *DockerCli) initSpecialVolumes(config *container.Config, hostConfig *c
 	return nil
 }
 
+func fileSourceVolume(source string) (bool, error) {
+	switch {
+	case strings.HasPrefix(source, "git://"):
+		return false, nil
+	case strings.HasPrefix(source, "http://"):
+		fallthrough
+	case strings.HasPrefix(source, "https://"):
+		part := strings.Split(source, ":")
+		count := len(part)
+		if strings.HasSuffix(source, "/") || strings.HasSuffix(source, ".git") ||
+			(count >= 3 && strings.HasSuffix(part[count-2], ".git")) {
+			return false, nil
+		} else {
+			return true, nil
+		}
+	case strings.HasPrefix(source, "/"):
+		info, err := os.Stat(source)
+		if err != nil {
+			return false, err
+		}
+		if info.IsDir() {
+			return false, nil
+		} else if info.Mode()&os.ModeType != 0 {
+			return false, fmt.Errorf("cannot init volume from special file: %s", source)
+		}
+		return true, nil
+	default:
+		return false, fmt.Errorf("unsupported volume source type: %s", source)
+	}
+
+}
+
 // CmdRun runs a command in a new container.
 //
 // Usage: docker run [OPTIONS] IMAGE [COMMAND] [ARG...]

api/client/utils.go

@@ -219,7 +219,7 @@ func (cli *DockerCli) resolveAuthConfig(authConfigs map[string]types.AuthConfig,
 }
 
 // uploadLocalResource upload a local file/directory to a container
-func (cli *DockerCli) uploadLocalResource(source, dest, serverIP, user, passwd string) error {
+func (cli *DockerCli) uploadLocalResource(source, dest, serverIP, user, passwd string, isFile bool) error {
 	if !strings.Contains(serverIP, ":") {
 		serverIP += ":21"
 	}
@@ -236,12 +236,25 @@ func (cli *DockerCli) uploadLocalResource(source, dest, serverIP, user, passwd s
 		return err
 	}
 
-	if err = ftp.Cwd(dest); err != nil {
-		return err
-	}
+	if isFile {
+		file, err := os.Open(source)
+		if err != nil {
+			return err
+		}
+		defer func() {
+			file.Close()
+		}()
+		if err = ftp.Stor(dest, file); err != nil {
+			return err
+		}
+	} else {
+		if err = ftp.Cwd(dest); err != nil {
+			return err
+		}
 
-	if err = ftp.Upload(source); err != nil {
-		return err
+		if err = ftp.Upload(source); err != nil {
+			return err
+		}
 	}
 
 	return nil

build-hyperserve-client.sh renamed to build.sh

@@ -59,7 +59,7 @@ func Parse(cmd *flag.FlagSet, args []string) (*container.Config, *container.Host
 		flPrivileged        = cmd.Bool([]string{}, false, "Give extended privileges to this container")
 		flPidMode           = cmd.String([]string{}, "", "PID namespace to use")
 		flUTSMode           = cmd.String([]string{}, "", "UTS namespace to use")
-		flPublishAll        = cmd.Bool([]string{}, true, "Publish all exposed ports to random ports")
+		flPublishAll        = cmd.Bool([]string{"P", "-publish-all"}, false, "Publish all exposed ports to random ports")
 		flStdin             = cmd.Bool([]string{"i", "-interactive"}, false, "Keep STDIN open even if not attached")
 		flTty               = cmd.Bool([]string{"t", "-tty"}, false, "Allocate a pseudo-TTY")
 		flOomKillDisable    = cmd.Bool([]string{}, false, "Disable OOM Killer")
@@ -90,7 +90,7 @@ func Parse(cmd *flag.FlagSet, args []string) (*container.Config, *container.Host
 		flLoggingDriver     = cmd.String([]string{}, "", "Logging driver for container")
 		flCgroupParent      = cmd.String([]string{}, "", "Optional parent cgroup for the container")
 		flVolumeDriver      = cmd.String([]string{}, "", "Optional volume driver for the container")
-		flStopSignal        = cmd.String([]string{}, signal.DefaultStopSignal, fmt.Sprintf("Signal to stop a container, %v by default", signal.DefaultStopSignal))
+		flStopSignal        = cmd.String([]string{"-stop-signal"}, signal.DefaultStopSignal, fmt.Sprintf("Signal to stop a container, %v by default", signal.DefaultStopSignal))
 		flIsolation         = cmd.String([]string{}, "", "Container isolation level")
 		flShmSize           = cmd.String([]string{}, "", "Size of /dev/shm, default value is 64MB")
 		flInstanceType      = cmd.String([]string{"-size"}, "xs", "The type for each instance (e.g. xxs, xs, s, m, l, xl, xxl)")
@@ -111,8 +111,8 @@ func Parse(cmd *flag.FlagSet, args []string) (*container.Config, *container.Host
 	cmd.Var(&flLabelsFile, []string{"-label-file"}, "Read in a line delimited file of labels")
 	cmd.Var(&flEnv, []string{"e", "-env"}, "Set environment variables")
 	cmd.Var(&flEnvFile, []string{"-env-file"}, "Read in a file of environment variables")
-	cmd.Var(&flPublish, []string{}, "Publish a container's port(s) to the host")
-	cmd.Var(&flExpose, []string{}, "Expose a port or a range of ports")
+	cmd.Var(&flPublish, []string{"p", "-publish"}, "Publish a container's port(s) to the host")
+	cmd.Var(&flExpose, []string{"-expose"}, "Expose a port or a range of ports")
 	cmd.Var(&flDNS, []string{}, "Set custom DNS servers")
 	cmd.Var(&flDNSSearch, []string{}, "Set custom DNS search domains")
 	cmd.Var(&flDNSOptions, []string{}, "Set DNS options")