From 2168a2fce764eb8db6a80b4e0a6e6136f5385c05 Mon Sep 17 00:00:00 2001 From: tanlang Date: Fri, 10 Jun 2022 15:50:32 +0800 Subject: [PATCH 1/3] fix: get BUILD_DOCKER_PROXY var from env --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 16d5f1058f..47bf1e7308 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ build: $(BUILD_DEPS) .PHONY: docker -BUILD_DOCKER_PROXY= + docker-buildenv: docker build --build-arg https_proxy=$(BUILD_DOCKER_PROXY) -t filvenus/venus-buildenv -f docker/venus-buildenv.dockerfile . From 6a182b8a2167c246bd98c0aae15ee7f05b472de6 Mon Sep 17 00:00:00 2001 From: tanlang Date: Fri, 10 Jun 2022 15:51:18 +0800 Subject: [PATCH 2/3] fix: change to build image from local repo --- dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dockerfile b/dockerfile index c35632f805..dd46f1a959 100644 --- a/dockerfile +++ b/dockerfile @@ -1,6 +1,6 @@ FROM filvenus/venus-buildenv AS buildenv -RUN git clone https://github.com/filecoin-project/venus.git --depth 1 +COPY . ./venus RUN export GOPROXY=https://goproxy.cn && cd venus && make RUN cd venus && ldd ./venus @@ -16,17 +16,17 @@ COPY ./docker/script /script # copy ddl COPY --from=buildenv /usr/lib/x86_64-linux-gnu/libhwloc.so.5 \ - /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 \ - /lib/x86_64-linux-gnu/libgcc_s.so.1 \ - /lib/x86_64-linux-gnu/libutil.so.1 \ - /lib/x86_64-linux-gnu/librt.so.1 \ - /lib/x86_64-linux-gnu/libpthread.so.0 \ - /lib/x86_64-linux-gnu/libm.so.6 \ - /lib/x86_64-linux-gnu/libdl.so.2 \ - /lib/x86_64-linux-gnu/libc.so.6 \ - /usr/lib/x86_64-linux-gnu/libnuma.so.1 \ - /usr/lib/x86_64-linux-gnu/libltdl.so.7 \ - /lib/ + /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 \ + /lib/x86_64-linux-gnu/libgcc_s.so.1 \ + /lib/x86_64-linux-gnu/libutil.so.1 \ + /lib/x86_64-linux-gnu/librt.so.1 \ + /lib/x86_64-linux-gnu/libpthread.so.0 \ + /lib/x86_64-linux-gnu/libm.so.6 \ + /lib/x86_64-linux-gnu/libdl.so.2 \ + /lib/x86_64-linux-gnu/libc.so.6 \ + /usr/lib/x86_64-linux-gnu/libnuma.so.1 \ + /usr/lib/x86_64-linux-gnu/libltdl.so.7 \ + /lib/ EXPOSE 3453 ENTRYPOINT ["/app/venus","daemon"] From 18a4bb14563b3c99afb038c358361747c15530a8 Mon Sep 17 00:00:00 2001 From: tanlang Date: Fri, 10 Jun 2022 15:55:04 +0800 Subject: [PATCH 3/3] fix: change golang version of buildenv to 1.17 --- docker/venus-buildenv.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/venus-buildenv.dockerfile b/docker/venus-buildenv.dockerfile index 2523d186d4..98ae855db5 100644 --- a/docker/venus-buildenv.dockerfile +++ b/docker/venus-buildenv.dockerfile @@ -1,5 +1,5 @@ # build container stage -FROM golang:1.16.5 AS build-env +FROM golang:1.17 AS build-env RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list