From 662b792781cb20bc816970fab2eaa2379ae37b23 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 16 Dec 2015 15:24:53 +0000 Subject: [PATCH] Make it compile again. --- experimental/tracer/Makefile | 2 +- experimental/tracer/main/main.go | 4 ++-- probe/docker/container.go | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/experimental/tracer/Makefile b/experimental/tracer/Makefile index 8310d7067..e66b58668 100644 --- a/experimental/tracer/Makefile +++ b/experimental/tracer/Makefile @@ -4,7 +4,7 @@ tracer.tar: main/main main/Dockerfile main/main: main/*.go main/static.go ptrace/*.go go get -tags netgo ./$(@D) - go build -ldflags "-extldflags \"-static\" -X main.version $(SCOPE_VERSION)" -tags netgo -o $@ ./$(@D) + go build -ldflags "-extldflags \"-static\"" -tags netgo -o $@ ./$(@D) main/static.go: ui/* esc -o main/static.go -prefix ui ui diff --git a/experimental/tracer/main/main.go b/experimental/tracer/main/main.go index a044bd4a0..15120a0cb 100644 --- a/experimental/tracer/main/main.go +++ b/experimental/tracer/main/main.go @@ -32,7 +32,7 @@ func (t *tracer) Stop() { } func main() { - dockerRegistry, err := docker.NewRegistry(pollInterval) + dockerRegistry, err := docker.NewRegistry(pollInterval, nil) if err != nil { log.Fatalf("Could start docker watcher: %v", err) } @@ -65,6 +65,6 @@ func handleSignals() chan struct{} { log.Printf("=== received SIGQUIT ===\n*** goroutine dump...\n%s\n*** end\n", buf[:stacklen]) } } - } () + }() return quit } diff --git a/probe/docker/container.go b/probe/docker/container.go index 8fadb4b3e..b2553317b 100644 --- a/probe/docker/container.go +++ b/probe/docker/container.go @@ -86,8 +86,6 @@ type Container interface { GetNode(string, []net.IP) report.Node State() string HasTTY() bool - - GetNode() report.Node Container() *docker.Container StartGatheringStats() error StopGatheringStats()