From bfa9682ba57d68aeba51108a4a7377afcc2f60be Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.com>
Date: Mon, 1 Mar 2021 17:01:06 -0600
Subject: [PATCH] Fix incorrect build flags

---
 Dockerfile | 2 +-
 Makefile   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 00d2c7686..20170e420 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,7 +28,7 @@ COPY . ./
 COPY --from=lattice-builder /lattice/build /lattice
 RUN /go/bin/statik -src=/lattice -dest=/pilosa
 
-RUN make build ${MAKE_FLAGS}
+RUN make build FLAGS="-o build/pilosa" ${MAKE_FLAGS}
 
 #####################
 ### Pilosa runner ###
diff --git a/Makefile b/Makefile
index 07f96df0a..70c94aaf3 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,6 @@ VARIANT = Molecula
 GO=go
 GOOS=$(shell $(GO) env GOOS)
 GOARCH=$(shell $(GO) env GOARCH)
-BINOUT=build
-FLAGS=-o $(BINOUT)/pilosa
 VERSION_ID=$(if $(TRIAL_DEADLINE),trial-$(TRIAL_DEADLINE)-,)$(VERSION)-$(GOOS)-$(GOARCH)
 BRANCH := $(if $(CIRCLE_BRANCH),$(CIRCLE_BRANCH),$(shell git rev-parse --abbrev-ref HEAD))
 BRANCH_ID := $(BRANCH)-$(GOOS)-$(GOARCH)