Merge remote-tracking branch 'origin/develop' into feature/spinners

* origin/develop:
  Display executed commands via Verbose Logging (#111)
  Better cross platform builds (#118)
  Fixing Outrigger Dashboard on Linux (#117)
  Fixed bug in libnss-resolver DNS resolution (#116)
  Added rpm to build, well, rpms
  Transitioned to different go base to try to head off problems with dynamically linked go binaries
  tweaking some build flags
  tweaking CGO
  messing with ldflags
  tweaked goreleaser config

Author: Adam Ross

.goreleaser.yml

@@ -1,9 +1,12 @@
 # One release file to rule them all
+project_name: outrigger-cli
 
 # Platforms/architectures to target
 builds:
   - binary: rig
     main: ./cmd/main.go
+    env:
+      - CGO_ENABLED=0
     goos:
       - windows
       - darwin
@@ -26,6 +29,7 @@ release:
   github:
     owner: phase2
     name: rig
+  draft: true
 
 # Publishing Homebrew Formula to the Tap repo
 brew:

Dockerfile

@@ -1,19 +1,20 @@
 FROM golang:1.9-alpine
 
 RUN apk add --no-cache \
-  ca-certificates \
-  git \
-  gcc \
-  libffi-dev \
-  make \
-  musl-dev \
-  rpm \
-  ruby \
-  ruby-dev \
-  tar \
-  && go get -u github.com/golang/dep/... \
+	ca-certificates \
+	git \
+	gcc \
+	libffi-dev \
+	make \
+	musl-dev \
+	rpm \
+	ruby \
+	ruby-dev \
+	tar
+
+RUN go get -u github.com/golang/dep/... \
   && go get -u github.com/alecthomas/gometalinter \
   && go get -u github.com/goreleaser/goreleaser
 
 RUN gometalinter --install --update
-RUN gem install --no-rdoc --no-ri fpm
+RUN gem install --no-rdoc --no-ri fpm

commands/config.go

@@ -3,7 +3,6 @@ package commands
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"strings"
 
 	"github.com/phase2/rig/util"
@@ -44,13 +43,13 @@ func (cmd *Config) Run(c *cli.Context) error {
 	}
 
 	// Clear out any previous environment variables
-	if output, err := exec.Command("docker-machine", "env", "-u").Output(); err == nil {
+	if output, err := util.Command("docker-machine", "env", "-u").Output(); err == nil {
 		os.Stdout.Write(output)
 	}
 
 	if cmd.machine.Exists() {
 		// Setup new values if machine is running
-		if output, err := exec.Command("docker-machine", "env", cmd.machine.Name).Output(); err == nil {
+		if output, err := util.Command("docker-machine", "env", cmd.machine.Name).Output(); err == nil {
 			os.Stdout.Write(output)
 		}
 	} else {

commands/dashboard.go

@@ -2,7 +2,6 @@ package commands
 
 import (
 	"fmt"
-	"os/exec"
 
 	"github.com/phase2/rig/util"
 	"github.com/urfave/cli"
@@ -59,11 +58,11 @@ func (cmd *Dashboard) LaunchDashboard(machine Machine) error {
 	}
 
 	cmd.out.Verbose.Printf("Attempting to update %s", dashboardImageName)
-	if err := util.StreamCommand(exec.Command("docker", "pull", dashboardImageName)); err != nil {
+	if err := util.StreamCommand("docker", "pull", dashboardImageName); err != nil {
 		cmd.out.Verbose.Println("Failed to update dashboard image. Will use local cache if available.")
 	}
 
-	dockerAPIVersion, _ := util.GetDockerServerAPIVersion(cmd.machine.Name)
+	dockerAPIVersion, _ := util.GetDockerServerAPIVersion()
 	args := []string{
 		"run",
 		"-d",
@@ -76,12 +75,11 @@ func (cmd *Dashboard) LaunchDashboard(machine Machine) error {
 		dashboardImageName,
 	}
 
-	util.StreamCommand(exec.Command("docker", args...))
-
+	util.ForceStreamCommand("docker", args...)
 	if util.IsMac() {
-		exec.Command("open", "http://dashboard.outrigger.vm").Run()
+		util.Command("open", "http://dashboard.outrigger.vm").Run()
 	} else if util.IsWindows() {
-		exec.Command("start", "http://dashboard.outrigger.vm").Run()
+		util.Command("start", "http://dashboard.outrigger.vm").Run()
 	} else {
 		cmd.out.Info.Println("Outrigger Dashboard is now available at http://dashboard.outrigger.vm")
 	}
@@ -91,6 +89,6 @@ func (cmd *Dashboard) LaunchDashboard(machine Machine) error {
 
 // StopDashboard stops and removes the dashboard container
 func (cmd *Dashboard) StopDashboard() {
-	exec.Command("docker", "stop", dashboardContainerName).Run()
-	exec.Command("docker", "rm", dashboardContainerName).Run()
+	util.Command("docker", "stop", dashboardContainerName).Run()
+	util.Command("docker", "rm", dashboardContainerName).Run()
 }

commands/data_backup.go

@@ -3,9 +3,7 @@ package commands
 import (
 	"fmt"
 	"os"
-	"os/exec"
 
-	"github.com/fatih/color"
 	"github.com/phase2/rig/util"
 	"github.com/urfave/cli"
 )
@@ -54,7 +52,7 @@ func (cmd *DataBackup) Run(c *cli.Context) error {
 	backupFile := fmt.Sprintf("%s%c%s.tgz", backupDir, os.PathSeparator, cmd.machine.Name)
 	if _, err := os.Stat(backupDir); err != nil {
 		cmd.out.Info.Printf("Creating backup directory: %s...", backupDir)
-		if mkdirErr := exec.Command("mkdir", "-p", backupDir).Run(); mkdirErr != nil {
+		if mkdirErr := util.Command("mkdir", "-p", backupDir).Run(); mkdirErr != nil {
 			cmd.out.Error.Println(mkdirErr)
 			return cmd.Error(fmt.Sprintf("Could not create backup directory %s", backupDir), "BACKUP-DIR-CREATE-FAILED", 12)
 		}
@@ -68,16 +66,9 @@ func (cmd *DataBackup) Run(c *cli.Context) error {
 	// Stream the archive to stdout and capture it in a local file so we don't waste
 	// space storing an archive on the VM filesystem. There may not be enough space.
 	archiveCmd := fmt.Sprintf("sudo tar czf - -C %s .", dataDir)
-	backup := exec.Command("docker-machine", "ssh", cmd.machine.Name, archiveCmd, ">", backupFile)
-	backup.Stderr = os.Stderr
-
-	color.Set(color.FgCyan)
-	err := backup.Run()
-	color.Unset()
-
-	if err != nil {
-		cmd.progress.Fail("Backup failed")
-		return cmd.Error(err.Error(), "COMMAND-ERROR", 13)
+	if err := util.StreamCommand("docker-machine", "ssh", cmd.machine.Name, archiveCmd, ">", backupFile); err != nil {
+		cmd.progress.Fail(fmt.Sprintf("Backup failed: %s", err.Error()))
+		return cmd.Error("Backup failed", "COMMAND-ERROR", 13)
 	}
 
 	cmd.progress.Complete(fmt.Sprintf("Backup complete: %s", backupFile))

commands/data_restore.go

@@ -3,10 +3,8 @@ package commands
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"strings"
 
-	"github.com/fatih/color"
 	"github.com/phase2/rig/util"
 	"github.com/urfave/cli"
 )
@@ -63,17 +61,9 @@ func (cmd *DataRestore) Run(c *cli.Context) error {
 
 	// Send the archive via stdin and extract inline. Saves on disk & performance
 	extractCmd := fmt.Sprintf("cat %s | docker-machine ssh %s \"sudo tar xzf - -C %s\"", backupFile, cmd.machine.Name, dataDir)
-	cmd.out.Info.Printf(extractCmd)
-	backup := exec.Command("bash", "-c", extractCmd)
-	backup.Stderr = os.Stderr
-
-	color.Set(color.FgCyan)
-	err := backup.Run()
-	color.Unset()
-
-	if err != nil {
-		cmd.progress.Fail("Data restore failed")
-		return cmd.Error(err.Error(), "COMMAND-ERROR", 13)
+	if err := util.StreamCommand("bash", "-c", extractCmd); err != nil {
+		cmd.progress.Fail(fmt.Sprintf("Data restore failed: %s", err.Error()))
+		return cmd.Error("Data restore failed", "COMMAND-ERROR", 13)
 	}
 
 	cmd.progress.Complete("Data restore complete")

commands/dns-records.go

@@ -4,11 +4,12 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"os/exec"
 	"strings"
 
 	"github.com/bitly/go-simplejson"
 	"github.com/urfave/cli"
+
+	"github.com/phase2/rig/util"
 )
 
 // DNSRecords is the command for exporting all DNS Records in Outrigger DNS in `hosts` file format
@@ -51,7 +52,7 @@ func (cmd *DNSRecords) Run(c *cli.Context) error {
 
 // LoadRecords retrieves the records from DNSDock and processes/return them
 func (cmd *DNSRecords) LoadRecords() ([]map[string]interface{}, error) {
-	ip, err := exec.Command("docker", "inspect", "--format", "{{.NetworkSettings.IPAddress}}", "dnsdock").Output()
+	ip, err := util.Command("docker", "inspect", "--format", "{{.NetworkSettings.IPAddress}}", "dnsdock").Output()
 	if err != nil {
 		return nil, fmt.Errorf("failed to discover dnsdock IP address: %s", err)
 	}

commands/dns.go

@@ -3,7 +3,6 @@ package commands
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"regexp"
 	"strings"
 
@@ -76,24 +75,24 @@ func (cmd *DNS) configureMacRoutes(machine Machine) {
 	if machine.IsXhyve() {
 		cmd.removeHostFilter(machineIP)
 	}
-	exec.Command("sudo", "route", "-n", "delete", "-net", "172.17.0.0").Run()
-	util.StreamCommand(exec.Command("sudo", "route", "-n", "add", "172.17.0.0/16", machineIP))
+	util.Command("sudo", "route", "-n", "delete", "-net", "172.17.0.0").Run()
+	util.StreamCommand("sudo", "route", "-n", "add", "172.17.0.0/16", machineIP)
 	if _, err := os.Stat("/usr/sbin/discoveryutil"); err == nil {
 		// Put this here for people running OS X 10.10.0 to 10.10.3 (oy vey.)
 		cmd.out.Verbose.Println("Restarting discoveryutil to flush DNS caches")
-		util.StreamCommand(exec.Command("sudo", "launchctl", "unload", "-w", "/System/Library/LaunchDaemons/com.apple.discoveryd.plist"))
-		util.StreamCommand(exec.Command("sudo", "launchctl", "load", "-w", "/System/Library/LaunchDaemons/com.apple.discoveryd.plist"))
+		util.StreamCommand("sudo", "launchctl", "unload", "-w", "/System/Library/LaunchDaemons/com.apple.discoveryd.plist")
+		util.StreamCommand("sudo", "launchctl", "load", "-w", "/System/Library/LaunchDaemons/com.apple.discoveryd.plist")
 	} else {
 		// Reset DNS cache. We have seen this suddenly make /etc/resolver/vm work.
 		cmd.out.Verbose.Println("Restarting mDNSResponder to flush DNS caches")
-		util.StreamCommand(exec.Command("sudo", "killall", "-HUP", "mDNSResponder"))
+		util.StreamCommand("sudo", "killall", "-HUP", "mDNSResponder")
 	}
 }
 
 // removeHostFilter removes the host filter from the xhyve bridge interface
 func (cmd *DNS) removeHostFilter(ipAddr string) {
 	// #1: route -n get <machineIP> to find the interface name
-	routeData, err := exec.Command("route", "-n", "get", ipAddr).CombinedOutput()
+	routeData, err := util.Command("route", "-n", "get", ipAddr).CombinedOutput()
 	if err != nil {
 		cmd.out.Warning.Println("Unable to determine bridge interface to remove hostfilter")
 		return
@@ -102,7 +101,7 @@ func (cmd *DNS) removeHostFilter(ipAddr string) {
 	iface := ifaceRegexp.FindStringSubmatch(string(routeData))[1]
 
 	// #2: ifconfig <interface name> to get the details
-	ifaceData, err := exec.Command("ifconfig", iface).CombinedOutput()
+	ifaceData, err := util.Command("ifconfig", iface).CombinedOutput()
 	if err != nil {
 		cmd.out.Warning.Println("Unable to determine member to remove hostfilter")
 		return
@@ -111,13 +110,13 @@ func (cmd *DNS) removeHostFilter(ipAddr string) {
 	member := memberRegexp.FindStringSubmatch(string(ifaceData))[1]
 
 	// #4: ifconfig <bridge> -hostfilter <member>
-	util.StreamCommand(exec.Command("sudo", "ifconfig", iface, "-hostfilter", member))
+	util.StreamCommand("sudo", "ifconfig", iface, "-hostfilter", member)
 }
 
 // ConfigureWindowsRoutes configures network routing
 func (cmd *DNS) configureWindowsRoutes(machine Machine) {
-	exec.Command("runas", "/noprofile", "/user:Administrator", "route", "DELETE", "172.17.0.0").Run()
-	util.StreamCommand(exec.Command("runas", "/noprofile", "/user:Administrator", "route", "-p", "ADD", "172.17.0.0/16", machine.GetIP()))
+	util.Command("runas", "/noprofile", "/user:Administrator", "route", "DELETE", "172.17.0.0").Run()
+	util.StreamCommand("runas", "/noprofile", "/user:Administrator", "route", "-p", "ADD", "172.17.0.0/16", machine.GetIP())
 }
 
 // StartDNS will start the dnsdock service
@@ -153,8 +152,8 @@ func (cmd *DNS) StartDNS(machine Machine, nameservers string) error {
 	for _, server := range dnsServers {
 		args = append(args, "--nameserver="+server)
 	}
-	util.StreamCommand(exec.Command("docker", args...))
 
+	util.ForceStreamCommand("docker", args...)
 	// Configure the resolvers based on platform
 	var resolverReturn error
 	if util.IsMac() {
@@ -174,21 +173,21 @@ func (cmd *DNS) configureMacResolver(machine Machine) error {
 	cmd.out.Verbose.Print("Configuring DNS resolution for macOS")
 	bridgeIP := machine.GetBridgeIP()
 
-	if err := exec.Command("sudo", "mkdir", "-p", "/etc/resolver").Run(); err != nil {
+	if err := util.Command("sudo", "mkdir", "-p", "/etc/resolver").Run(); err != nil {
 		return err
 	}
-	if err := exec.Command("bash", "-c", fmt.Sprintf("echo 'nameserver %s' | sudo tee /etc/resolver/vm", bridgeIP)).Run(); err != nil {
+	if err := util.Command("bash", "-c", fmt.Sprintf("echo 'nameserver %s' | sudo tee /etc/resolver/vm", bridgeIP)).Run(); err != nil {
 		return err
 	}
 	if _, err := os.Stat("/usr/sbin/discoveryutil"); err == nil {
 		// Put this here for people running OS X 10.10.0 to 10.10.3 (oy vey.)
 		cmd.out.Verbose.Println("Restarting discoveryutil to flush DNS caches")
-		util.StreamCommand(exec.Command("sudo", "launchctl", "unload", "-w", "/System/Library/LaunchDaemons/com.apple.discoveryd.plist"))
-		util.StreamCommand(exec.Command("sudo", "launchctl", "load", "-w", "/System/Library/LaunchDaemons/com.apple.discoveryd.plist"))
+		util.StreamCommand("sudo", "launchctl", "unload", "-w", "/System/Library/LaunchDaemons/com.apple.discoveryd.plist")
+		util.StreamCommand("sudo", "launchctl", "load", "-w", "/System/Library/LaunchDaemons/com.apple.discoveryd.plist")
 	} else {
 		// Reset DNS cache. We have seen this suddenly make /etc/resolver/vm work.
 		cmd.out.Verbose.Println("Restarting mDNSResponder to flush DNS caches")
-		util.StreamCommand(exec.Command("sudo", "killall", "-HUP", "mDNSResponder"))
+		util.StreamCommand("sudo", "killall", "-HUP", "mDNSResponder")
 	}
 	return nil
 }
@@ -204,18 +203,18 @@ func (cmd *DNS) configureLinuxResolver() error {
 	// Is NetworkManager in use
 	if _, err := os.Stat("/etc/NetworkManager/dnsmasq.d"); err == nil {
 		// Install for NetworkManager/dnsmasq connection to dnsdock
-		util.StreamCommand(exec.Command("bash", "-c", fmt.Sprintf("echo 'server=/vm/%s' | sudo tee /etc/NetworkManager/dnsmasq.d/dnsdock.conf", bridgeIP)))
+		util.StreamCommand("bash", "-c", fmt.Sprintf("echo 'server=/vm/%s' | sudo tee /etc/NetworkManager/dnsmasq.d/dnsdock.conf", bridgeIP))
 
 		// Restart NetworkManager if it is running
-		if err := exec.Command("systemctl", "is-active", "NetworkManager").Run(); err != nil {
-			util.StreamCommand(exec.Command("sudo", "systemctl", "restart", "NetworkManager"))
+		if err := util.Command("systemctl", "is-active", "NetworkManager").Run(); err != nil {
+			util.StreamCommand("sudo", "systemctl", "restart", "NetworkManager")
 		}
 	}
 
 	// Is libnss-resolver in use
 	if _, err := os.Stat("/etc/resolver"); err == nil {
 		// Install for libnss-resolver connection to dnsdock
-		exec.Command("bash", "-c", fmt.Sprintf("echo 'nameserver %s' | sudo tee /etc/resolver/vm", bridgeIP)).Run()
+		util.Command("bash", "-c", fmt.Sprintf("echo 'nameserver %s:53' | sudo tee /etc/resolver/vm", bridgeIP)).Run()
 	}
 
 	return nil
@@ -230,6 +229,6 @@ func (cmd *DNS) configureWindowsResolver(machine Machine) error {
 
 // StopDNS stops the dnsdock service and cleans up
 func (cmd *DNS) StopDNS() {
-	exec.Command("docker", "stop", "dnsdock").Run()
-	exec.Command("docker", "rm", "dnsdock").Run()
+	util.Command("docker", "stop", "dnsdock").Run()
+	util.Command("docker", "rm", "dnsdock").Run()
 }