cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

clone fil-blst in extra for the local:docker runner (#256)

Browse Source
This commit is contained in:
Anton Evangelatov 2020-09-16 17:30:03 +02:00 committed by GitHub
parent f702ce331a
commit 63f903a3fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -6,7 +6,7 @@ download-proofs:
go run github.com/filecoin-project/go-paramfetch/paramfetch 2048 ./docker-images/proof-parameters.json
build-images:
docker build -t "iptestground/oni-buildbase:v6" -f "docker-images/Dockerfile.oni-buildbase" "docker-images"
docker build -t "iptestground/oni-buildbase:v7" -f "docker-images/Dockerfile.oni-buildbase" "docker-images"
docker build -t "iptestground/oni-runtime:v3" -f "docker-images/Dockerfile.oni-runtime" "docker-images"
docker build -t "iptestground/oni-runtime:v4-debug" -f "docker-images/Dockerfile.oni-runtime-debug" "docker-images"

1
README.md
View File

@ -222,6 +222,7 @@ Additional to the Filecoin FFI Git submodules, we are also bundling `proof param
* `v4` => locking in Filecoin FFI commit 6a143e06f923f3a4f544c7a652e8b4df420a3d28.
* `v5` => locking in Filecoin FFI commit cddc56607e1d851ea6d09d49404bd7db70cb3c2e.
* `v6` => locking in Filecoin FFI commit 40569104603407c999d6c9e4c3f1228cbd4d0e5c.
* `v7` => add Filecoin-BLST repo to buildbase.
### oni-runtime

8
docker-images/Dockerfile.oni-buildbase
View File

@ -12,3 +12,11 @@ RUN mkdir -p ${FFI_DIR} \
&& cd ${FFI_DIR} \
&& git checkout ${FILECOIN_FFI_COMMIT} \
&& make
ARG FIL_BLST_COMMIT=5f93488
ARG BLST_DIR=/extra/fil-blst
RUN mkdir -p ${BLST_DIR} \
&& git clone https://github.com/filecoin-project/fil-blst.git ${BLST_DIR} \
&& cd ${BLST_DIR} \
&& git checkout ${FIL_BLST_COMMIT}

4
lotus-soup/manifest.toml
View File

@ -1,5 +1,5 @@
name = "lotus-soup"
extra_sources = { "exec:go" = ["../extra/filecoin-ffi"] }
extra_sources = { "exec:go" = ["../extra/filecoin-ffi", "../extra/fil-blst"] }
[defaults]
builder = "docker:go"
@ -10,7 +10,7 @@ enabled = true
[builders."docker:go"]
enabled = true
build_base_image = "iptestground/oni-buildbase:v6"
build_base_image = "iptestground/oni-buildbase:v7"
runtime_image = "iptestground/oni-runtime:v4-debug"
[runners."local:exec"]