From 0f173cab032c5e6149bacefc04d247ca1006eee9 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Tue, 23 Aug 2022 14:25:13 +0200 Subject: [PATCH 1/3] Basic docker build environment. --- Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..92ce41865 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM rust:1-buster AS build-env + +# Install dependencies +RUN apt-get update && apt-get install --no-install-recommends -y build-essential clang + +WORKDIR /usr/src/builtin-actors + +# Grab the correct toolchain +RUN rustup toolchain install nightly && rustup target add wasm32-unknown-unknown + +ENTRYPOINT ["/bin/bash"] From b21c256fb24754f252cbbf2043185953c3fb5bbb Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Tue, 23 Aug 2022 16:07:26 +0200 Subject: [PATCH 2/3] Dockerfile: Run scripts by default. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 92ce41865..a29cca324 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ WORKDIR /usr/src/builtin-actors # Grab the correct toolchain RUN rustup toolchain install nightly && rustup target add wasm32-unknown-unknown -ENTRYPOINT ["/bin/bash"] +ENTRYPOINT ["/bin/bash", "-c"] From ee1cd7939f7156b7e649badb11634c7c026ddb62 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Tue, 23 Aug 2022 16:15:50 +0200 Subject: [PATCH 3/3] Add makefile rule for dockerized build. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 95ebc7d48..1ffafc5a8 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,9 @@ all-bundles: bundle-mainnet bundle-caterpillarnet bundle-butterflynet bundle-cal bundle-mainnet: deps-build BUILD_FIL_NETWORK=mainnet cargo run -- -o output/builtin-actors-mainnet.car +bundle-mainnet-repro: + docker run --rm -it -v `pwd`:/usr/src/builtin-actors -v `pwd`/output:/usr/src/builtin-actors/output:rshared builtin-actors "make bundle-mainnet" + bundle-caterpillarnet: deps-build BUILD_FIL_NETWORK=caterpillarnet cargo run -- -o output/builtin-actors-caterpillarnet.car