From 169eb195235b99ec5f223f503458670fb064470f Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Thu, 28 May 2015 12:54:21 +0100 Subject: [PATCH] allow proxy to intercept unversioned (i.e. 1.0) urls --- proxy/common.go | 4 ++-- proxy/proxy.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/proxy/common.go b/proxy/common.go index 1198ef1b..6f6480fb 100644 --- a/proxy/common.go +++ b/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 { diff --git a/proxy/proxy.go b/proxy/proxy.go index ee820a21..f781385b 100644 --- a/proxy/proxy.go +++ b/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 {