feat:#4759 venus-market : add docker feature

.github/workflows/tag-workflow.yml

@@ -175,4 +175,13 @@ 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: |
+          docker build . --file dockerfile --tag filvenus/venus-market:latest
+          docker tag filvenus/venus-market:latest filvenus/venus-market:${{steps.vars.outputs.github_tag}}
+          docker login --username=filvenus --password ${{ secrets.DOCKER_PASSWORD }} 
+          docker push filvenus/venus-market:${{steps.vars.outputs.github_tag}}
+          docker push filvenus/venus-market:latest

.gitignore

@@ -10,6 +10,7 @@ market-client
 venus-market
 sequence_chart.md
 .idea
+.vscode
 coverage.*
 # Test binary, built with `go test -c`
 *.test
@@ -20,4 +21,4 @@ data-transfer
 # Dependency directories (remove the comment below to include it)
 # vendor/
 
-build-dep
+build-dep

Makefile

@@ -60,4 +60,12 @@ build: $(BUILD_DEPS)
 	rm -f market-client
 	rm -f venus-market
 	go build -o ./market-client $(GOFLAGS) ./cmd/market-client
-	go build -o ./venus-market $(GOFLAGS) ./cmd/venus-market
+	go build -o ./venus-market $(GOFLAGS) ./cmd/venus-market
+
+
+	# docker
+.PHONY: docker
+BUILD_DOCKER_PROXY=
+
+docker:
+	docker build --build-arg https_proxy=$(BUILD_DOCKER_PROXY) -t venus-market .

docker/config/PieceStorage.toml

@@ -0,0 +1,5 @@
+[PieceStorage]
+
+  [[PieceStorage.Fs]]
+    ReadOnly = false
+    Path = "/PieceStorage"

docker/script/compose.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+echo "Compose Init Begin!"
+
+echo $@
+
+
+token=$(cat /env/token )
+
+echo "token:"
+echo ${token}
+
+echo "set default piece storage path: /PieceStorage"
+mkdir -p ~/.venusmarket/
+cat /docker/config/PieceStorage.toml > ~/.venusmarket/config.toml
+
+echo "Compose Int End!"
+
+
+/app/venus-market pool-run \
+--node-url=/ip4/127.0.0.1/tcp/3453  \
+--auth-url=http://127.0.0.1:8989 \
+--gateway-url=/ip4/127.0.0.1/tcp/45132/ \
+--messager-url=/ip4/127.0.0.1/tcp/39812/ \
+--auth-token=${token}

docker/script/init.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+echo "Init Begin!"
+
+echo "args:"
+echo $@
+
+
+echo "set default piece storage path: /PieceStorage"
+mkdir -p ~/.venusmarket/
+cat /docker/config/PieceStorage.toml > ~/.venusmarket/config.toml
+cat  ~/.venusmarket/config.toml
+echo "Init End!"
+
+/app/venus-market $@

docker/script/wait-for-it.sh

@@ -0,0 +1,182 @@
+#!/usr/bin/env bash
+# Use this script to test if a given TCP host/port are available
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+    cat << USAGE >&2
+Usage:
+    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+    -h HOST | --host=HOST       Host or IP under test
+    -p PORT | --port=PORT       TCP port under test
+                                Alternatively, you specify the host and port as host:port
+    -s | --strict               Only execute subcommand if the test succeeds
+    -q | --quiet                Don't output any status messages
+    -t TIMEOUT | --timeout=TIMEOUT
+                                Timeout in seconds, zero for no timeout
+    -- COMMAND ARGS             Execute command with args after the test finishes
+USAGE
+    exit 1
+}
+
+wait_for()
+{
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    else
+        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+    fi
+    WAITFORIT_start_ts=$(date +%s)
+    while :
+    do
+        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+            WAITFORIT_result=$?
+        else
+            (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+            WAITFORIT_result=$?
+        fi
+        if [[ $WAITFORIT_result -eq 0 ]]; then
+            WAITFORIT_end_ts=$(date +%s)
+            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+            break
+        fi
+        sleep 1
+    done
+    return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    else
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    fi
+    WAITFORIT_PID=$!
+    trap "kill -INT -$WAITFORIT_PID" INT
+    wait $WAITFORIT_PID
+    WAITFORIT_RESULT=$?
+    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    fi
+    return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        *:* )
+        WAITFORIT_hostport=(${1//:/ })
+        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+        shift 1
+        ;;
+        --child)
+        WAITFORIT_CHILD=1
+        shift 1
+        ;;
+        -q | --quiet)
+        WAITFORIT_QUIET=1
+        shift 1
+        ;;
+        -s | --strict)
+        WAITFORIT_STRICT=1
+        shift 1
+        ;;
+        -h)
+        WAITFORIT_HOST="$2"
+        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+        shift 2
+        ;;
+        --host=*)
+        WAITFORIT_HOST="${1#*=}"
+        shift 1
+        ;;
+        -p)
+        WAITFORIT_PORT="$2"
+        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --port=*)
+        WAITFORIT_PORT="${1#*=}"
+        shift 1
+        ;;
+        -t)
+        WAITFORIT_TIMEOUT="$2"
+        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --timeout=*)
+        WAITFORIT_TIMEOUT="${1#*=}"
+        shift 1
+        ;;
+        --)
+        shift
+        WAITFORIT_CLI=("$@")
+        break
+        ;;
+        --help)
+        usage
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        usage
+        ;;
+    esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+    echoerr "Error: you need to provide a host and port to test."
+    usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# Check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+    WAITFORIT_ISBUSY=1
+    # Check if busybox timeout uses -t flag
+    # (recent Alpine versions don't support -t anymore)
+    if timeout &>/dev/stdout | grep -q -e '-t '; then
+        WAITFORIT_BUSYTIMEFLAG="-t"
+    fi
+else
+    WAITFORIT_ISBUSY=0
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+    wait_for
+    WAITFORIT_RESULT=$?
+    exit $WAITFORIT_RESULT
+else
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        wait_for_wrapper
+        WAITFORIT_RESULT=$?
+    else
+        wait_for
+        WAITFORIT_RESULT=$?
+    fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+        exit $WAITFORIT_RESULT
+    fi
+    exec "${WAITFORIT_CLI[@]}"
+else
+    exit $WAITFORIT_RESULT
+fi

dockerfile

@@ -0,0 +1,33 @@
+FROM filvenus/venus-buildenv AS buildenv
+
+RUN git clone https://github.com/filecoin-project/venus-market.git --depth 1 
+RUN export GOPROXY=https://goproxy.cn && cd venus-market  && make deps && make
+RUN cd venus-market && ldd ./venus-market
+
+
+FROM filvenus/venus-runtime
+
+# DIR for app
+WORKDIR /app
+
+# copy the app from build env
+COPY --from=buildenv  /go/venus-market/venus-market /app/venus-market
+COPY ./docker/script  /script
+COPY ./docker /docker
+
+# 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 41235 58418
+ENTRYPOINT ["/script/init.sh"]