modify the makefile

Author: jsenmax

Dockerfile

@@ -18,18 +18,12 @@ COPY go.mod go.sum* ./
 RUN go mod download
 
 COPY . .
-RUN LEDGER_ENABLED=false LINK_STATICALLY=true BUILD_TAGS=muslc make build
-RUN echo "Ensuring binary is statically linked ..."  \
-    && file /src/app/build/gaiad | grep "statically linked" \
+RUN LEDGER_ENABLED=false LINK_STATICALLY=true BUILD_TAGS=muslc make release
 
 # Add to a distroless container
-FROM alpine:$IMG_TAG
-RUN apk add --no-cache build-base jq
-RUN addgroup -g 1025 nonroot
-RUN adduser -D nonroot -u 1025 -G nonroot
+FROM gcr.io/distroless/cc:$IMG_TAG
 ARG IMG_TAG
 COPY --from=shentud-builder /go/bin/shentud /usr/local/bin/
 EXPOSE 26656 26657 1317 9090
-USER nonroot
 
 ENTRYPOINT ["shentud", "start"]

Makefile

@@ -86,9 +86,7 @@ update-cli-docs: install
 	@perl -pi -e "s|$$HOME|~|" docs/**/*.md
 
 release: go.sum
-	GOOS=linux go build $(BUILD_FLAGS) -o build/shentud ./app/shentud
-	GOOS=windows go build $(BUILD_FLAGS) -o build/shentud.exe ./app/shentud
-	GOOS=darwin go build $(BUILD_FLAGS) -o build/shentud-macos ./app/shentud
+	GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o build/shentud ./app/shentud
 
 build: go.sum
 ifeq ($(OS),Windows_NT)
@@ -98,7 +96,7 @@ else
 endif
 
 build-linux: go.sum
-	LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 $(MAKE) build
+	CGO_ENABLED=1 LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 $(MAKE) build
 
 ########## Tools ##########
 
@@ -206,7 +204,7 @@ start-localnet-ci:
 # include simulations
 include sims.mk
 
-.PHONY: all build-linux install release release32 \
+.PHONY: all build-linux install release build \
 	fix lint test cov coverage coverage.out image image.update \
 	build-docker-shentunode localnet-start localnet-stop \
 	docker-build-debug docker-build-hermes \