Merge pull request #91 from InjectiveLabs/f/build-fix

feat: add docker build flag
InjectiveLabs · Jul 6, 2023 · d189c5c · d189c5c
2 parents 40bd518 + e462815
commit d189c5c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,7 +19,7 @@ COPY . .
 RUN go mod download
 
 #install binary
-RUN make install
+RUN DOCKER=true make install
 
 #build main container
 FROM alpine:latest

diff --git a/Dockerfile.nonroot b/Dockerfile.nonroot
@@ -19,7 +19,7 @@ COPY . .
 RUN go mod download
 
 #install binary
-RUN make install
+RUN DOCKER=true make install
 
 #build main container
 FROM alpine:latest

diff --git a/Makefile b/Makefile
@@ -3,6 +3,7 @@ GIT_COMMIT = $(shell git rev-parse --short HEAD)
 BUILD_DATE = $(shell date -u "+%Y%m%d-%H%M")
 VERSION_PKG = github.com/InjectiveLabs/peggo/orchestrator/version
 IMAGE_NAME := gcr.io/injective-core/peggo
+DOCKER ?= false
 
 all:
 
@@ -18,9 +19,7 @@ push:
 install: export GOPROXY=direct
 install: export VERSION_FLAGS="-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) -X $(VERSION_PKG).BuildDate=$(BUILD_DATE)"
 install:
-	go install \
-		-ldflags $(VERSION_FLAGS) \
-		./cmd/...
+	$(DOCKER) && go install -tags muslc -ldflags $(VERSION_FLAGS) ./cmd/... || go install -ldflags $(VERSION_FLAGS) ./cmd/...
 
 .PHONY: install image push test gen