Merge branch 'master' into prep/v1.6.0-rc2

.github/workflows/tag-workflow.yml

@@ -171,4 +171,17 @@ jobs:
                   --data-urlencode "link=$link" \
                   --data-urlencode "description=message:${{steps.vars.outputs.git_message}}, branch:${{steps.vars.outputs.branch}}, commit:${{steps.vars.outputs.short}}, tag:${{steps.vars.outputs.github_tag}}" \
                   --data-urlencode "version=${{steps.vars.outputs.short}}"
-          set -e
+          set -e
+
+      - name: Publish the Docker image 
+        if: ${{ github.ref_type == 'tag' && github.event_name == 'create' }}
+        run: |
+          make docker-buildenv
+          make docker-runtime
+          docker build . --file dockerfile --tag filvenus/venus:latest
+          docker tag filvenus/venus:latest filvenus/venus:${{steps.vars.outputs.github_tag}}
+          docker login --username=filvenus --password ${{ secrets.DOCKER_PASSWORD }} 
+          docker push filvenus/venus:${{steps.vars.outputs.github_tag}}
+          docker push filvenus/venus:latest
+          docker push filvenus/venus-runtime:latest
+          docker push filvenus/venus-buildenv:latest

Makefile

@@ -114,3 +114,16 @@ dist-clean:
 build: $(BUILD_DEPS)
 	rm -f venus
 	go build -o ./venus $(GOFLAGS) .
+
+
+.PHONY: docker
+
+
+docker-buildenv:
+	docker build --build-arg https_proxy=$(BUILD_DOCKER_PROXY) -t filvenus/venus-buildenv -f docker/venus-buildenv.dockerfile .
+
+docker-runtime:
+	docker build --build-arg https_proxy=$(BUILD_DOCKER_PROXY) -t filvenus/venus-runtime -f docker/venus-runtime.dockerfile .
+
+docker:
+	docker build --build-arg https_proxy=$(BUILD_DOCKER_PROXY) -t venus .

docker/script/compose.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+echo $@
+
+if [ $nettype = "calibnet" ];then
+    nettype="cali"
+fi
+
+echo "nettype:"
+echo $nettype
+./venus daemon --network=${nettype} --auth-url=http://127.0.0.1:8989 --import-snapshot /snapshot.car

docker/venus-buildenv.dockerfile

@@ -0,0 +1,14 @@
+# build container stage
+FROM golang:1.17 AS build-env
+
+RUN  sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+
+
+# download dependence
+RUN apt-get update -y 
+RUN apt-get install -y \
+     mesa-opencl-icd ocl-icd-opencl-dev bzr jq pkg-config  hwloc libhwloc-dev
+RUN apt-get install -y \
+     gcc  clang build-essential  
+RUN apt-get install -y \
+     make ncftp git curl  wget

docker/venus-runtime.dockerfile

@@ -0,0 +1,12 @@
+FROM ubuntu:20.04
+
+# install dependence
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl vim telnet
+
+# set time zone to Shanghai
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' >/etc/timezone
+
+# set charset
+ENV LANG C.UTF-8

dockerfile

@@ -0,0 +1,32 @@
+FROM filvenus/venus-buildenv AS buildenv
+
+COPY . ./venus
+RUN export GOPROXY=https://goproxy.cn && cd venus  && make
+RUN cd venus && ldd ./venus
+
+
+FROM filvenus/venus-runtime
+
+# DIR for app
+WORKDIR /app
+
+# copy the app from build env
+COPY --from=buildenv  /go/venus/venus /app/venus
+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/
+
+EXPOSE 3453
+ENTRYPOINT ["/app/venus","daemon"]