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

upgrade docker images

Browse Source
This commit is contained in:
Anton Evangelatov 2021-04-27 16:28:57 +02:00
parent 7e25a811c3
commit a9e4a0d22b
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
testplans/Makefile
View File

@ -6,18 +6,18 @@ download-proofs:
go run github.com/filecoin-project/go-paramfetch/paramfetch 2048 ./docker-images/proof-parameters.json go run github.com/filecoin-project/go-paramfetch/paramfetch 2048 ./docker-images/proof-parameters.json
build-images: build-images:
docker build -t "iptestground/oni-buildbase:v13-lotus" -f "docker-images/Dockerfile.oni-buildbase" "docker-images" docker build -t "iptestground/oni-buildbase:v14-lotus" -f "docker-images/Dockerfile.oni-buildbase" "docker-images"
docker build -t "iptestground/oni-runtime:v7" -f "docker-images/Dockerfile.oni-runtime" "docker-images" docker build -t "iptestground/oni-runtime:v9" -f "docker-images/Dockerfile.oni-runtime" "docker-images"
docker build -t "iptestground/oni-runtime:v8-debug" -f "docker-images/Dockerfile.oni-runtime-debug" "docker-images" docker build -t "iptestground/oni-runtime:v9-debug" -f "docker-images/Dockerfile.oni-runtime-debug" "docker-images"
push-images: push-images:
docker push iptestground/oni-buildbase:v13-lotus docker push iptestground/oni-buildbase:v14-lotus
docker push iptestground/oni-runtime:v7 docker push iptestground/oni-runtime:v9
docker push iptestground/oni-runtime:v8-debug docker push iptestground/oni-runtime:v9-debug
pull-images: pull-images:
docker pull iptestground/oni-buildbase:v13-lotus docker pull iptestground/oni-buildbase:v14-lotus
docker pull iptestground/oni-runtime:v7 docker pull iptestground/oni-runtime:v9
docker pull iptestground/oni-runtime:v8-debug docker pull iptestground/oni-runtime:v9-debug
.PHONY: download-proofs build-images push-images pull-images .PHONY: download-proofs build-images push-images pull-images

4
testplans/docker-images/Dockerfile.oni-buildbase
View File

@ -1,10 +1,10 @@
ARG GO_VERSION=1.15.6 ARG GO_VERSION=1.16.3
FROM golang:${GO_VERSION}-buster 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 libhwloc-dev 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 libhwloc-dev
ARG FILECOIN_FFI_COMMIT=62f89f108a6a8fe9ad6ed52fb7ffbf8594d7ae5c ARG FILECOIN_FFI_COMMIT=d82899449741ce190e950a3582ebe33806f018a9
ARG FFI_DIR=/extern/filecoin-ffi ARG FFI_DIR=/extern/filecoin-ffi
RUN mkdir -p ${FFI_DIR} \ RUN mkdir -p ${FFI_DIR} \

4
testplans/docker-images/Dockerfile.oni-runtime
View File

@ -1,4 +1,4 @@
ARG GO_VERSION=1.15.6 ARG GO_VERSION=1.16.3
FROM golang:${GO_VERSION}-buster as downloader FROM golang:${GO_VERSION}-buster as downloader
@ -8,7 +8,7 @@ FROM golang:${GO_VERSION}-buster as downloader
## 3. Trigger the download. ## 3. Trigger the download.
## Output will be in /var/tmp/filecoin-proof-parameters. ## Output will be in /var/tmp/filecoin-proof-parameters.
RUN go get github.com/filecoin-project/go-paramfetch/paramfetch RUN go get github.com/filecoin-project/go-paramfetch/paramfetch@master
COPY /proof-parameters.json / COPY /proof-parameters.json /
RUN paramfetch 8388608 /proof-parameters.json RUN paramfetch 8388608 /proof-parameters.json

6
testplans/docker-images/Dockerfile.oni-runtime-debug
View File

@ -1,4 +1,4 @@
ARG GO_VERSION=1.15.6 ARG GO_VERSION=1.16.3
FROM golang:${GO_VERSION}-buster as downloader FROM golang:${GO_VERSION}-buster as downloader
@ -8,11 +8,11 @@ FROM golang:${GO_VERSION}-buster as downloader
## 3. Trigger the download. ## 3. Trigger the download.
## Output will be in /var/tmp/filecoin-proof-parameters. ## Output will be in /var/tmp/filecoin-proof-parameters.
RUN go get github.com/filecoin-project/go-paramfetch/paramfetch RUN go get github.com/filecoin-project/go-paramfetch/paramfetch@master
COPY /proof-parameters.json / COPY /proof-parameters.json /
RUN paramfetch 8388608 /proof-parameters.json RUN paramfetch 8388608 /proof-parameters.json
ARG LOTUS_COMMIT=b4ad2e5e93dc710d985eb9cf3ee04142efb47bf0 ARG LOTUS_COMMIT=7e25a811c3d80ea3e007a54aa1da089985110c2c
## for debug purposes ## for debug purposes
RUN apt update && apt install -y mesa-opencl-icd ocl-icd-opencl-dev gcc git bzr jq pkg-config libhwloc-dev curl && git clone https://github.com/filecoin-project/lotus.git && cd lotus/ && git checkout ${LOTUS_COMMIT} && make clean && make all && make install RUN apt update && apt install -y mesa-opencl-icd ocl-icd-opencl-dev gcc git bzr jq pkg-config libhwloc-dev curl && git clone https://github.com/filecoin-project/lotus.git && cd lotus/ && git checkout ${LOTUS_COMMIT} && make clean && make all && make install

4
testplans/lotus-soup/manifest.toml
View File

@ -9,8 +9,8 @@ enabled = true
[builders."docker:go"] [builders."docker:go"]
enabled = true enabled = true
build_base_image = "iptestground/oni-buildbase:v13-lotus" build_base_image = "iptestground/oni-buildbase:v14-lotus"
runtime_image = "iptestground/oni-runtime:v8-debug" runtime_image = "iptestground/oni-runtime:v9-debug"
[runners."local:exec"] [runners."local:exec"]
enabled = true enabled = true