From fd265c7dff9b6434c8a9eda1bed7d7a308c49b24 Mon Sep 17 00:00:00 2001 From: Pancongwen Date: Mon, 28 Nov 2022 15:29:14 +0800 Subject: [PATCH] Feature/githubaction (#2782) * update makefile: set CGO_ENABLED=1 * update dockerfile: update secend stage baseimage to alpine:3.16 --- Dockerfile | 2 +- Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index cbe5d89ad..fcf22468c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN make build # ---------------------------- -FROM alpine:3.12 +FROM alpine:3.16 # p2p port EXPOSE 26656 diff --git a/Makefile b/Makefile index 8143d52b1..12f6e3335 100644 --- a/Makefile +++ b/Makefile @@ -83,9 +83,9 @@ build-linux: go.sum LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 $(MAKE) build build-all-binary: go.sum - LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) CGO_ENABLED=0 -o build/iris-linux-amd64 ./cmd/iris - LEDGER_ENABLED=false GOOS=linux GOARCH=arm64 go build $(BUILD_FLAGS) CGO_ENABLED=0 -o build/iris-linux-arm64 ./cmd/iris - LEDGER_ENABLED=false GOOS=windows GOARCH=amd64 go build $(BUILD_FLAGS) CGO_ENABLED=0 -o build/iris-windows-amd64.exe ./cmd/iris + LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) CGO_ENABLED=1 -o build/iris-linux-amd64 ./cmd/iris + LEDGER_ENABLED=false GOOS=linux GOARCH=arm64 go build $(BUILD_FLAGS) CGO_ENABLED=1 -o build/iris-linux-arm64 ./cmd/iris + LEDGER_ENABLED=false GOOS=windows GOARCH=amd64 go build $(BUILD_FLAGS) CGO_ENABLED=1 -o build/iris-windows-amd64.exe ./cmd/iris build-contract-tests-hooks: ifeq ($(OS),Windows_NT)