From 6c98f88ecf94ca1e3ce4d49f5c1c6fe94656cdff Mon Sep 17 00:00:00 2001 From: Jay Jie Date: Thu, 20 Jul 2023 01:50:48 -0700 Subject: [PATCH] chore: update docker to support wasm --- Dockerfile | 18 ++++++++---------- Makefile | 6 ++++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c3b172..8ea9d9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,21 @@ -FROM golang:alpine3.13 AS build-env +FROM golang:1.20-alpine AS build-env -# Set up dependencies -ENV PACKAGES bash curl make git libc-dev gcc linux-headers eudev-dev python3 +ENV PACKAGES make gcc libc-dev linux-headers bash curl git WORKDIR /rizon -COPY go.mod . -COPY go.sum . - COPY . . -RUN apk add --no-cache $PACKAGES && make install +ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.2.1/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.a -FROM alpine:edge +RUN apk add --no-cache $PACKAGES && \ + BUILD_TAGS=muslc LINK_STATICALLY=true make install && \ + rm -rf /var/cache/apk/* -RUN apk add --update ca-certificates +FROM alpine:edge WORKDIR /rizon COPY --from=build-env /go/bin/rizond /usr/bin/rizond -CMD ["rizond"] +CMD ["rizond"] \ No newline at end of file diff --git a/Makefile b/Makefile index f25c1b4..91ef888 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,12 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=rizon \ ldflags += $(LDFLAGS) ldflags := $(strip $(ldflags)) +ifeq ($(LINK_STATICALLY),true) + ldflags += -linkmode=external -extldflags "-Wl,-z,muldefs -static" +endif +ldflags += $(LDFLAGS) +ldflags := $(strip $(ldflags)) + BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)' .PHONY: install protocgen update-swagger-docs