From f351b7efa6188141a003139165e7ac7a096db24e Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Wed, 9 Dec 2020 13:21:07 -0600 Subject: [PATCH] Use "make" inside docker build so that CGO_ENABLED uses exported value from Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 212042a07..abd07304d 100644 --- a/Makefile +++ b/Makefile @@ -198,7 +198,7 @@ docker-tag-push: vendor # Compile Pilosa inside Docker container docker-build: vendor - docker run --rm -v $(PWD):/go/src/$(CLONE_URL) -w /go/src/$(CLONE_URL) -e GOOS=$(GOOS) -e GOARCH=$(GOARCH) golang:$(GO_VERSION) go build -mod=vendor -tags='$(BUILD_TAGS)' -ldflags $(LDFLAGS) $(FLAGS) $(CLONE_URL)/$(MOD_VERSION)/cmd/pilosa + docker run --rm -v $(PWD):/go/src/$(CLONE_URL) -w /go/src/$(CLONE_URL) -e GOOS=$(GOOS) -e GOARCH=$(GOARCH) golang:$(GO_VERSION) make build FLAGS="$(FLAGS) -mod=vendor" RELEASE=$(RELEASE) # Install diagnostic pilosa-keydump tool. Allows viewing the keys in a transaction-engine directory. pilosa-keydump: