From 0575fdb313384f2f12cdd9527f872898aaecf2bc Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Fri, 24 May 2013 11:31:11 -0700 Subject: [PATCH 1/3] Fix issue within auth test Upstream-commit: 0146f65a448d2d42271300f1477ea9fa378d6360 Component: engine --- components/engine/api_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/api_test.go b/components/engine/api_test.go index de4289728e..06413e1303 100644 --- a/components/engine/api_test.go +++ b/components/engine/api_test.go @@ -56,7 +56,7 @@ func TestGetAuth(t *testing.T) { t.Fatalf("%d OK or 0 expected, received %d\n", http.StatusOK, r.Code) } - newAuthConfig := srv.registry.GetAuthConfig() + newAuthConfig := srv.registry.GetAuthConfig(false) if newAuthConfig.Username != authConfig.Username || newAuthConfig.Email != authConfig.Email { t.Fatalf("The auth configuration hasn't been set correctly") From 68053e95b66d9b102b943c375772364817204382 Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Fri, 24 May 2013 11:31:19 -0700 Subject: [PATCH 2/3] Gofmt Upstream-commit: ae72c2f4d6c37a14fcd81658f6ae42d65f5c7169 Component: engine --- components/engine/docker/docker.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/docker/docker.go b/components/engine/docker/docker.go index 28b4d7f927..1749b2fd39 100644 --- a/components/engine/docker/docker.go +++ b/components/engine/docker/docker.go @@ -24,8 +24,8 @@ func main() { docker.SysInit() return } - host:= "127.0.0.1" - port:= 4243 + host := "127.0.0.1" + port := 4243 // FIXME: Switch d and D ? (to be more sshd like) flDaemon := flag.Bool("d", false, "Daemon mode") flDebug := flag.Bool("D", false, "Debug mode") From e668458c4bc4e2509561e867a78fc04e0eb0c2aa Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Fri, 24 May 2013 11:31:36 -0700 Subject: [PATCH 3/3] Simplify the Host flag parsing Upstream-commit: bfb65b733a2cfa0dac6a5760897f09d8e2557381 Component: engine --- components/engine/docker/docker.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/engine/docker/docker.go b/components/engine/docker/docker.go index 1749b2fd39..7b8aa7f858 100644 --- a/components/engine/docker/docker.go +++ b/components/engine/docker/docker.go @@ -40,15 +40,19 @@ func main() { docker.NetworkBridgeIface = docker.DefaultNetworkBridge } - if strings.Contains(*flHost, ":") && len(strings.Split(*flHost, ":")) == 2 { + if strings.Contains(*flHost, ":") { hostParts := strings.Split(*flHost, ":") + if len(hostParts) != 2 { + log.Fatal("Invalid bind address format.") + os.Exit(-1) + } if hostParts[0] != "" { host = hostParts[0] } if p, err := strconv.Atoi(hostParts[1]); err == nil { port = p } - } else if !strings.Contains(*flHost, ":") { + } else { host = *flHost }