scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-07 09:05:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1492 from codysoyland/fix-flags

Browse source 
Fix incorrect build flags
This commit is contained in:
Cody Soyland 2021-03-02 07:46:07 -06:00 • committed by GitHub
commit 0488dbe8d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -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 ###

2
Makefile
View file

@ -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)