cleanup Makefile

Makefile

@@ -15,9 +15,9 @@ build: vendor
 build-query:
 	CGO_ENABLED=0 GOARCH=$(ARCH) go build -a -tags netgo -o $(OUT_DIR)/$(ARCH)/wavefront-query ./cmd/wavefront-query/
 
-# Build linux executable using container (useful on Mac)
-linux-build:
-	./deploy/docker-build.sh $(VERSION)
+# Build linux executable
+build-linux: vendor
+	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -a -tags netgo -o $(OUT_DIR)/$(ARCH)/wavefront-adapter-linux ./cmd/wavefront-adapter/
 
 vendor: glide.lock
 	glide install -v
@@ -36,10 +36,9 @@ gofmt:
 
 verify: verify-gofmt test
 
-# TODO: rever to be based out of build or none at all?
-container: linux-build
+container: build-linux
 	cp deploy/Dockerfile $(TEMP_DIR)
-	cp $(OUT_DIR)/$(ARCH)/wavefront-adapter $(TEMP_DIR)/wavefront-adapter
+	cp $(OUT_DIR)/$(ARCH)/wavefront-adapter-linux $(TEMP_DIR)/wavefront-adapter
 	cd $(TEMP_DIR)
 	docker build -t $(DOCKER_REPO)/$(DOCKER_IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
 	docker tag $(DOCKER_REPO)/$(DOCKER_IMAGE)-$(ARCH):$(VERSION) $(DOCKER_REPO)/$(DOCKER_IMAGE):latest