Merge pull request #356 from taskcluster/fix-docker-attach-proxy

Fix AttachProxy on docker-engine

Author: jonasfj

engines/docker/engine_test.go

@@ -118,3 +118,25 @@ func TestArtifacts(t *testing.T) {
 
 	c.Test()
 }
+
+func TestProxies(t *testing.T) {
+	c := enginetest.ProxyTestCase{
+		EngineProvider: provider,
+		ProxyName:      "my-proxy",
+		PingProxyPayload: `{
+			"command": ["sh", "-ec", "` +
+			`apk add --no-cache curl > /dev/null; ` +
+			`echo 'Pinging'; ` +
+			`STATUS=$(curl -s -o /tmp/output -w '%{http_code}' http://taskcluster/my-proxy/v1/ping); ` +
+			`cat /tmp/output; ` +
+			`test $STATUS -eq 200;` +
+			`"],
+			"image": {
+				"repository": "` + dockerImageRepository + `",
+				"tag": "` + dockerImageTag + `"
+			}
+		}`,
+	}
+
+	c.Test()
+}

engines/docker/network/pool.go

@@ -118,6 +118,9 @@ func (p *Pool) GetNetwork(handler http.Handler) (*Handle, error) {
 	}
 	p.idleNetworks = p.idleNetworks[:len(p.idleNetworks)-1]
 
+	// Set handler for the network
+	h.network.SetHandler(handler)
+
 	return h, nil
 }
 

engines/docker/sandboxbuilder.go

@@ -38,6 +38,7 @@ func newSandboxBuilder(payload *payloadType, e *engine, monitor runtime.Monitor,
 		e:         e,
 		taskCtx:   ctx,
 		env:       &docker.Env{},
+		proxies:   make(map[string]http.Handler),
 		imageDone: make(chan struct{}, 1),
 	}
 	// set image

engines/enginetest/attachproxy.go

@@ -47,6 +47,7 @@ func (c *ProxyTestCase) TestPingProxyPayload() {
 
 	result := r.buildRunSandbox()
 	log := r.ReadLog()
+	debug("task-log: '%s'", log)
 
 	assert(result, "PingProxyPayload exited unsuccessfully, log: ", log)
 	assert(pinged, "PingProxyPayload didn't call the attachedProxy, log: ", log)
@@ -79,6 +80,7 @@ func (c *ProxyTestCase) TestPing404IsUnsuccessful() {
 
 	result := r.buildRunSandbox()
 	log := r.ReadLog()
+	debug("task-log: '%s'", log)
 
 	assert(!result, "PingProxyPayload exited successfully, when we returned 404")
 	assert(pinged, "PingProxyPayload didn't call the attachedProxy")
@@ -129,6 +131,7 @@ func (c *ProxyTestCase) TestLiveLogging() {
 
 	result := r.buildRunSandbox()
 	log := r.ReadLog()
+	debug("task-log: '%s'", log)
 
 	assert(result, "PingProxyPayload exited unsuccessfully")
 	assert(pinged, "PingProxyPayload didn't call the attachedProxy")