Merge pull request #777 from paulbellamy/proxy-versionless

allow proxy to intercept unversioned (i.e. 1.0) urls

Closes #770. Closes #778.

proxy/common.go

@@ -15,7 +15,7 @@ import (
 )
 
 var (
-	containerIDRegexp   = regexp.MustCompile("^/v[0-9\\.]*/containers/([^/]*)/.*")
+	containerIDRegexp   = regexp.MustCompile("^(/v[0-9\\.]*)?/containers/([^/]*)/.*")
 	weaveWaitEntrypoint = []string{"/home/weavewait/weavewait"}
 )
 
@@ -54,7 +54,7 @@ func inspectContainerInPath(client *docker.Client, path string) (*docker.Contain
 		Warning.Println(err)
 		return nil, err
 	}
-	containerID := subs[1]
+	containerID := subs[2]
 
 	container, err := client.InspectContainer(containerID)
 	if err != nil {

proxy/create_container_interceptor.go

@@ -38,7 +38,13 @@ func (i *createContainerInterceptor) InterceptRequest(r *http.Request) error {
 
 	if cidrs, ok := weaveCIDRsFromConfig(container.Config); ok || i.withIPAM {
 		Info.Printf("Creating container with WEAVE_CIDR \"%s\"", strings.Join(cidrs, " "))
+		if container.HostConfig == nil {
+			container.HostConfig = &docker.HostConfig{}
+		}
 		container.HostConfig.VolumesFrom = append(container.HostConfig.VolumesFrom, "weaveproxy")
+		if container.Config == nil {
+			container.Config = &docker.Config{}
+		}
 		if err := i.setWeaveWaitEntrypoint(container.Config); err != nil {
 			return err
 		}

proxy/proxy.go

@@ -12,9 +12,9 @@ import (
 )
 
 var (
-	containerCreateRegexp = regexp.MustCompile("/v[0-9\\.]*/containers/create")
-	containerStartRegexp  = regexp.MustCompile("^/v[0-9\\.]*/containers/[^/]*/(re)?start$")
-	execCreateRegexp      = regexp.MustCompile("^/v[0-9\\.]*/containers/[^/]*/exec$")
+	containerCreateRegexp = regexp.MustCompile("^(/v[0-9\\.]*)?/containers/create$")
+	containerStartRegexp  = regexp.MustCompile("^(/v[0-9\\.]*)?/containers/[^/]*/(re)?start$")
+	execCreateRegexp      = regexp.MustCompile("^(/v[0-9\\.]*)?/containers/[^/]*/exec$")
 )
 
 type Proxy struct {

test/620_proxy_entrypoint_command_test.sh

@@ -32,4 +32,22 @@ weave_on $HOST1 launch-proxy --with-ipam
 
 assert_raises "proxy docker_on $HOST1 run check-ethwe-up"
 
+create_container_json=$(cat <<-EOF
+{
+  "Hostname":"c1",
+  "AttachStdin":false,
+  "AttachStdout":true,
+  "AttachStderr":true,
+  "Tty":false,
+  "OpenStdin":false,
+  "StdinOnce":false,
+  "Image":"check-ethwe-up"
+}
+EOF
+)
+
+# Test a minimal request to the unversioned (v1.0) docker api
+CONTAINER_ID=$(curl -s -X POST --header "Content-Type: application/json" http://$HOST1:12375/containers/create -d "$create_container_json" | sed -e 's/.*"Id":"\([^"]*\)".*/\1/')
+assert_raises "proxy docker_on $HOST1 start -ai $CONTAINER_ID"
+
 end_suite