Merge pull request #1966 from weaveworks/issues/1965-fix-local-weave-ps

Make weaveutil container-addrs observe $PROCFS

Fixes #1965.

prog/weaveutil/addrs.go

@@ -7,19 +7,19 @@ import (
 )
 
 func containerAddrs(args []string) error {
-	if len(args) < 2 {
-		cmdUsage("container-addrs", "<procPath> <bridgeName> [containerID ...]")
+	if len(args) < 1 {
+		cmdUsage("container-addrs", "<bridgeName> [containerID ...]")
 	}
+	bridgeName := args[0]
 
-	procPath := args[0]
-	bridgeName := args[1]
+	procPath := procDir()
 
 	c, err := docker.NewVersionedClientFromEnv("1.18")
 	if err != nil {
 		return err
 	}
 
-	for _, containerID := range args[2:] {
+	for _, containerID := range args[1:] {
 		netDevs, err := getNetDevs(procPath, bridgeName, c, containerID)
 		if err != nil {
 			if _, ok := err.(*docker.NoSuchContainer); ok {

prog/weaveutil/docker_tls_args.go

@@ -7,7 +7,6 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -17,10 +16,7 @@ func dockerTLSArgs(args []string) error {
 	if len(args) > 0 {
 		cmdUsage("docker-tls-args", "")
 	}
-	procRoot := os.Getenv("PROCFS")
-	if procRoot == "" {
-		procRoot = "/proc"
-	}
+	procRoot := procDir()
 	dirEntries, err := ioutil.ReadDir(procRoot)
 	if err != nil {
 		return err

prog/weaveutil/main.go

@@ -60,3 +60,11 @@ func cmdUsage(cmd string, usage string) {
 	fmt.Fprintf(os.Stderr, "usage: weaveutil %s %s\n", cmd, usage)
 	os.Exit(1)
 }
+
+func procDir() string {
+	procDir := os.Getenv("PROCFS")
+	if procDir == "" {
+		procDir = "/proc"
+	}
+	return procDir
+}

test/140_weave_local_test.sh

@@ -21,4 +21,6 @@ assert_raises "exec_on $HOST1 c1 $CHECK_ETHWE_UP"
 weave_local_on $HOST1 run             -ti --name=c2 $SMALL_IMAGE /bin/sh
 assert_raises "exec_on $HOST1 c2 $CHECK_ETHWE_UP"
 
+assert "weave_local_on $HOST1 ps | wc -l" 3
+
 end_suite

weave

@@ -1034,7 +1034,7 @@ with_container_addresses() {
     COMMAND=$1
     shift 1
 
-    util_op container-addrs $PROCFS $BRIDGE "$@" | while read CONTAINER_ID CONTAINER_MAC CONTAINER_IPS; do
+    util_op container-addrs $BRIDGE "$@" | while read CONTAINER_ID CONTAINER_MAC CONTAINER_IPS; do
         $COMMAND "$CONTAINER_ID" "$CONTAINER_MAC" "$CONTAINER_IPS"
     done
 }