From f9c325c7934d304a75ac7f6ae02d4dec71f76156 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Mon, 8 Jun 2015 21:57:49 +0100 Subject: [PATCH] refactor: more sensible field order --- proxy/create_container_interceptor.go | 2 +- proxy/proxy.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/create_container_interceptor.go b/proxy/create_container_interceptor.go index 5051cdbe..7edf0500 100644 --- a/proxy/create_container_interceptor.go +++ b/proxy/create_container_interceptor.go @@ -13,8 +13,8 @@ import ( type createContainerInterceptor struct { client *docker.Client - withDNS bool dockerBridgeIP string + withDNS bool withIPAM bool } diff --git a/proxy/proxy.go b/proxy/proxy.go index de932baa..83ac1313 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -89,7 +89,7 @@ func (proxy *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { path := r.URL.Path switch { case containerCreateRegexp.MatchString(path): - proxy.serveWithInterceptor(&createContainerInterceptor{proxy.client, proxy.WithDNS, proxy.dockerBridgeIP, proxy.WithIPAM}, w, r) + proxy.serveWithInterceptor(&createContainerInterceptor{proxy.client, proxy.dockerBridgeIP, proxy.WithDNS, proxy.WithIPAM}, w, r) case containerStartRegexp.MatchString(path): proxy.serveWithInterceptor(&startContainerInterceptor{proxy.client, proxy.WithDNS, proxy.WithIPAM}, w, r) case execCreateRegexp.MatchString(path):