Modify docker build

.github/workflows/docker.yml

@@ -35,6 +35,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: ${{github.event_name != 'pull_request'}}
+          build-args: ARCH=x86_64
           tags: ${{steps.meta.outputs.tags}}
           labels: ${{steps.meta.outputs.labels}}
           platforms: linux/amd64

CHANGELOG.md

@@ -86,6 +86,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (ci) [\#580](https://github.com/line/lbm-sdk/pull/580) fix the problem that the registered docker image couldn't run on M1.
 * (simapp) [\#591](https://github.com/line/lbm-sdk/pull/591) chore: add x/wasm module to simapp
 * (ci) [\#618](https://github.com/line/lbm-sdk/pull/618) remove stale action
+* (ci) [\#619](https://github.com/line/lbm-sdk/pull/619) change the Dockerfile to use the downloaded static library
 
 ### Document Updates
 

Dockerfile

@@ -1,5 +1,5 @@
 # Simple usage with a mounted data directory:
-# > docker build --platform="linux/amd64" -t simapp .
+# > docker build --platform="linux/amd64" -t simapp . --build-arg ARCH=x86_64
 #
 # Server:
 # > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.simapp:/root/.simapp simapp simd init test-chain
@@ -11,6 +11,7 @@
 # > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.simappcli:/root/.simapp simapp simd keys list
 # TODO: demo connecting rest-server (or is this in server now?)
 FROM golang:alpine AS build-env
+ARG ARCH=$ARCH
 
 # Install minimum necessary dependencies,
 ENV PACKAGES curl make git libc-dev bash gcc g++ linux-headers eudev-dev python3
@@ -29,28 +30,21 @@ COPY ./go.mod /go/src/github.com/line/lbm-sdk/go.mod
 COPY ./go.sum /go/src/github.com/line/lbm-sdk/go.sum
 RUN go mod download
 
-# Build cosmwasm
-ENV RUSTUP_HOME=/usr/local/rustup
-ENV CARGO_HOME=/usr/local/cargo
-ENV PATH=$CARGO_HOME/bin:$PATH
+# See https://github.com/line/wasmvm/releases
+# See https://github.com/line/wasmvm/releases
+ADD https://github.com/line/wasmvm/releases/download/v1.0.0-0.10.0/libwasmvm_static.x86_64.a /lib/libwasmvm_static.x86_64.a
+ADD https://github.com/line/wasmvm/releases/download/v1.0.0-0.10.0/libwasmvm_static.aarch64.a /lib/libwasmvm_static.aarch64.a
+RUN sha256sum /lib/libwasmvm_static.aarch64.a | grep bc3db72ba32f34ad88ceb1d20479411bd7f50ccd6a5ca50cc8ca462a561e6189
+RUN sha256sum /lib/libwasmvm_static.x86_64.a | grep 352fa5de5f9dba66f0a38082541d3e63e21394fee3e577ea35e0906294c61276
 
-RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-musl/rustup-init"
-RUN chmod +x rustup-init
-RUN ./rustup-init -y --no-modify-path --default-toolchain 1.57.0; rm rustup-init
-RUN chmod -R a+w $RUSTUP_HOME $CARGO_HOME
-RUN cd $(go list -f "{{ .Dir }}" -m github.com/line/wasmvm) && \
-    cd ./libwasmvm && \
-    RUSTFLAGS='-C target-feature=-crt-static' cargo build --release --example staticlib && \
-    mv -f target/release/examples/libstaticlib.a /usr/lib/libwasmvm_static.a && \
-    rm -rf target
+RUN ln -s /lib/libwasmvm_static.${ARCH}.a /usr/lib/libwasmvm_static.a
 
 # Add source files
 COPY . .
 
 # install simapp, remove packages
 RUN BUILD_TAGS=static make build CGO_ENABLED=1
 
-
 # Final image
 FROM alpine:edge
 

Makefile

@@ -13,6 +13,7 @@ HTTPS_GIT := https://github.com/line/lbm-sdk.git
 DOCKER := $(shell which docker)
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf
 CGO_ENABLED ?= 1
+ARCH ?= x86_64
 
 export GO111MODULE = on
 
@@ -116,6 +117,9 @@ BUILD_TARGETS := build install
 build: BUILD_ARGS=-o $(BUILDDIR)/
 	CGO_CFLAGS=$(CGO_CFLAGS) CGO_LDFLAGS=$(CGO_LDFLAGS) CGO_ENABLED=$(CGO_ENABLED) go build -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./...
 
+build-docker: go.sum $(BUILDDIR)/
+	docker build -t simapp:latest . --platform="linux/amd64" --build-arg ARCH=$(ARCH)
+
 # todo: should be fix
 build-linux:
 	GOOS=linux GOARCH=amd64 LEDGER_ENABLED=false $(MAKE) build