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

Merge pull request #102 from filecoin-project/upgrade-ffi

Browse Source 
upgrade buildbase to v4
This commit is contained in:
Anton Evangelatov 2020-07-06 13:14:23 +02:00 committed by GitHub
commit f4568fc819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ FROM golang:${GO_VERSION}-buster
RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc git pkg-config bzr RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc git pkg-config bzr
ARG FILECOIN_FFI_COMMIT=5342c7c97d1a1df4650629d14f2823d52889edd9 ARG FILECOIN_FFI_COMMIT=6a143e06f923f3a4f544c7a652e8b4df420a3d28
ARG FFI_DIR=/extra/filecoin-ffi ARG FFI_DIR=/extra/filecoin-ffi
RUN mkdir -p ${FFI_DIR} \ RUN mkdir -p ${FFI_DIR} \

1
docker-images/HISTORY.md
View File

@ -5,6 +5,7 @@
* `v1` => initial image locking in FFI commit ca281af0b6c00314382a75ae869e5cb22c83655b. * `v1` => initial image locking in FFI commit ca281af0b6c00314382a75ae869e5cb22c83655b.
* `v2` => no changes; released only for aligning both images to aesthetically please @nonsense :D * `v2` => no changes; released only for aligning both images to aesthetically please @nonsense :D
* `v3` => locking in FFI commit 5342c7c97d1a1df4650629d14f2823d52889edd9. * `v3` => locking in FFI commit 5342c7c97d1a1df4650629d14f2823d52889edd9.
* `v4` => locking in FFI commit 6a143e06f923f3a4f544c7a652e8b4df420a3d28.
## oni-runtime ## oni-runtime

1
docker-images/build.sh → docker-images/build-buildbase.sh
View File

@ -24,4 +24,3 @@ fi
dir="$(dirname "$0")" dir="$(dirname "$0")"
docker build -t "iptestground/oni-buildbase:$TAG" -f "$dir/Dockerfile.oni-buildbase" "$dir" docker build -t "iptestground/oni-buildbase:$TAG" -f "$dir/Dockerfile.oni-buildbase" "$dir"
docker build -t "iptestground/oni-runtime:$TAG" -f "$dir/Dockerfile.oni-runtime" "$dir"

7
docker-images/push.sh → docker-images/build-runtime.sh
View File

@ -17,9 +17,10 @@ TAG=$1
# Validate required arguments # Validate required arguments
if [ -z "$TAG" ] if [ -z "$TAG" ]
then then
echo -e "Please provide a tag for the push. For example: \`./push.sh v3\`" echo -e "Please provide a tag for the build. For example: \`./build.sh v3\`"
exit 2 exit 2
fi fi
docker push "iptestground/oni-buildbase:$TAG" dir="$(dirname "$0")"
docker push "iptestground/oni-runtime:$TAG"
docker build -t "iptestground/oni-runtime:$TAG" -f "$dir/Dockerfile.oni-runtime" "$dir"