Merge pull request #3508 from s-koba/3507-fix-redhat-ssh-logs

Add SSH logs when provisioning with RedHat derivatives

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+# 0.8.0 (2016-6-14)
+
+General
+- Fix issue with plugin heartbeat log repeating on disconnect
+- Add `tcsh` support to `env --shell`
+- Add `zsh` completion scripts
+- Bump Go version to 1.6.2
+
+Drivers
+- `amazonec2`
+    - Workaround to prevent orphaned SSH keys
+- `virtualbox`
+    - Add option for VM UI type (`--virtualbox-ui-type`)
+- `vmwarefusion`
+    - Fix CPU option inconsistency
+- `openstack`
+    - Expose user data parameter (`--openstack-user-data-file`)
+- `generic`
+    - Copy public key to created Machine directory
+
+Provisioners
+- Add Oracle Enterprise Linux support
+- Fix port binding of Swarm master
+- Add ability to create a manager instance which does not get scheduled on
+- Introduce `--swarm-join-opt` to pass options to agent nodes
+- Various SSH-related fixes
+- Fix state for upgrade path
+
 # 0.7.0 (2016-4-13)
 
 General

docs/AVAILABLE_DRIVER_PLUGINS.md

@@ -38,6 +38,7 @@ with Docker Inc.  Use 3rd party plugins at your own risk.
 | RackHD           | <https://github.com/emccode/docker-machine-rackhd>       | [kacole2](https://github.com/kacole2)                                                  | kendrick.coleman@emc.com                                      |
 | SAKURA CLOUD           | <https://github.com/yamamoto-febc/docker-machine-sakuracloud>       | [yamamoto-febc](https://github.com/yamamoto-febc)                                                  | yamamoto.febc@gmail.com                                      |
 | Scaleway               | <https://github.com/scaleway/docker-machine-driver-scaleway>        | [scaleway](https://github.com/scaleway)                                                            | opensource@scaleway.com                                      |
+| Skytap                 | <https://github.com/skytap/docker-machine-driver-skytap>            | [dantjones](https://github.com/dantjones)                                                      | djones@skytap.com                                      |
 | Ubiquity Hosting       | <https://github.com/ubiquityhosting/docker-machine-driver-ubiquity> | [Justin Canington](https://github.com/justacan)<br>[Andrew Ayers](https://github.com/andrew-ayers) | justin.canington@nobistech.net<br>andrew.ayers@nobistech.net |
 | UCloud                 | <https://github.com/ucloud/docker-machine-ucloud>                   | [xiaohui](https://github.com/xiaohui)                                                              | xiaohui.zju@gmail.com                                        |
 | VMWare Workstation     | <https://github.com/pecigonzalo/docker-machine-vmwareworkstation>   | [pecigonzalo](https://github.com/pecigonzalo)                                                      | pecigonzalo@outlook.com                                      |

drivers/google/google.go

@@ -35,7 +35,7 @@ const (
 	defaultUser        = "docker-user"
 	defaultMachineType = "n1-standard-1"
 	defaultImageName   = "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1510-wily-v20151114"
-	defaultScopes      = "https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write"
+	defaultScopes      = "https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write"
 	defaultDiskType    = "pd-standard"
 	defaultDiskSize    = 10
 )

libmachine/provision/fedora_test.go

@@ -17,12 +17,12 @@ func TestFedoraGenerateYumRepoList(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	m, err := regexp.MatchString(".*fedora/22.*", buf.String())
+	m, err := regexp.MatchString(".*fedora/23.*", buf.String())
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	if !m {
-		t.Fatalf("expected match for fedora/22")
+		t.Fatalf("expected match for fedora/23")
 	}
 }

libmachine/provision/redhat.go

@@ -248,7 +248,7 @@ func generateYumRepoList(provisioner Provisioner) (*bytes.Buffer, error) {
 		packageListInfo.OsReleaseVersion = "7"
 	case "fedora":
 		packageListInfo.OsRelease = "fedora"
-		packageListInfo.OsReleaseVersion = "22"
+		packageListInfo.OsReleaseVersion = "23"
 	case "ol":
 		packageListInfo.OsRelease = "oraclelinux"
 		v := majorVersionRE.FindStringSubmatch(releaseInfo.Version)

libmachine/provision/redhat_ssh_commander.go

@@ -1,7 +1,10 @@
 package provision
 
 import (
+	"fmt"
+
 	"github.com/docker/machine/libmachine/drivers"
+	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/ssh"
 )
 
@@ -15,17 +18,29 @@ func (sshCmder RedHatSSHCommander) SSHCommand(args string) (string, error) {
 		return "", err
 	}
 
+	log.Debugf("About to run SSH command:\n%s", args)
+
 	// redhat needs "-t" for tty allocation on ssh therefore we check for the
 	// external client and add as needed.
 	// Note: CentOS 7.0 needs multiple "-tt" to force tty allocation when ssh has
 	// no local tty.
+	var output string
 	switch c := client.(type) {
 	case *ssh.ExternalClient:
 		c.BaseArgs = append(c.BaseArgs, "-tt")
-		client = c
+		output, err = c.Output(args)
 	case *ssh.NativeClient:
-		return c.OutputWithPty(args)
+		output, err = c.OutputWithPty(args)
 	}
 
-	return client.Output(args)
+	log.Debugf("SSH cmd err, output: %v: %s", err, output)
+	if err != nil {
+		return "", fmt.Errorf(`Something went wrong running an SSH command!
+command : %s
+err     : %v
+output  : %s
+`, args, err, output)
+	}
+
+	return output, nil
 }

script/release.sh

@@ -120,7 +120,7 @@ display "Bump version number to ${VERSION}"
 # Why 'sed' and then 'mv' instead of 'sed -i'?  BSD / GNU sed compatibility.
 # Macs have BSD sed by default, Linux has GNU sed.  See
 # http://unix.stackexchange.com/questions/92895/how-to-achieve-portability-with-sed-i-in-place-editing
-sed -e "s/Version = \".*-dev\"/Version = \"${VERSION}\"/g" version/version.go >version/version.go.new
+sed -e "s/Version = \".*\"$/Version = \"${VERSION}\"/g" version/version.go >version/version.go.new
 checkError "Unable to change version in version/version.go"
 mv -- version/version.go.new version/version.go