feat: rm dockerfile

.gitignore

@@ -23,3 +23,4 @@ data-transfer
 # vendor/
 
 build-dep
+dockerfile

Makefile

@@ -66,5 +66,8 @@ build: $(BUILD_DEPS)
 # docker
 .PHONY: docker
 
+TAG:=test
 docker:
-	docker build --build-arg https_proxy=$(BUILD_DOCKER_PROXY) -t venus-market .
+	curl -O https://raw.githubusercontent.com/filecoin-project/venus-docs/feat/tanlang/improve-docker-usage/script/dockerfile
+	docker build --build-arg https_proxy=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=venus-market -t venus-market .
+	docker tag venus-market filvenus/venus-market:$(TAG)

docker/script/init.sh

@@ -1,15 +1,14 @@
 #!/bin/sh
 
-echo "Init Begin!"
-
-echo "args:"
-echo $@
-
-
-echo "set default piece storage path: /PieceStorage"
+echo "Init Begin!\n"
+echo "set default piece storage path: /PieceStorage\n"
 mkdir -p ~/.venusmarket/
-cat /docker/config/PieceStorage.toml > ~/.venusmarket/config.toml
-cat  ~/.venusmarket/config.toml
-echo "Init End!"
+if [ ! -f ~/.venusmarket/config.toml ]; then
+    echo "set default piece storage path: /PieceStorage"
+    cat /docker/config/PieceStorage.toml > ~/.venusmarket/config.toml
+fi
+echo "Init End!\n"
+
+echo "EXEC: ./venus-market  $@ \n\n"
 
-/app/venus-market $@
+./venus-market  $@

dockerfile

@@ -1,20 +1,27 @@
 FROM filvenus/venus-buildenv AS buildenv
 
-COPY . ./venus-market
-RUN export GOPROXY=https://goproxy.cn && cd venus-market  && make deps && make
-RUN cd venus-market && ldd ./venus-market
+WORKDIR /build
+
+COPY ./go.mod /build/
+COPY ./exter[n] ./go.mod  /build/extern/
+RUN export GOPROXY=https://goproxy.cn,direct && go mod download 
+
+COPY . /build
+RUN export GOPROXY=https://goproxy.cn,direct  && make
+
 
 
 FROM filvenus/venus-runtime
 
+ARG BUILD_TARGET=venus-miner
+
 # DIR for app
 WORKDIR /app
 
 # copy the app from build env
-COPY --from=buildenv  /go/venus-market/venus-market /app/venus-market
+COPY --from=buildenv  /build/${BUILD_TARGET} /app/${BUILD_TARGET}
+
 COPY ./docker/script  /script
-COPY ./docker /docker
 
 
-EXPOSE 41235 58418
 ENTRYPOINT ["/script/init.sh"]