diff --git a/.github/workflows/build_upload.yml b/.github/workflows/build_upload.yml index c25342572f..2ea5ceca59 100644 --- a/.github/workflows/build_upload.yml +++ b/.github/workflows/build_upload.yml @@ -7,7 +7,7 @@ on: jobs: build_upload: - uses: ./.github/workflows/common_build_upload.yml + uses: filecoin-project/venus/.github/workflows/common_build_upload.yml@master with: bin_name: 'venus' has_ffi: true diff --git a/.github/workflows/common_docker_image.yml b/.github/workflows/common_docker_image.yml index b99087dbdc..3c869fda71 100644 --- a/.github/workflows/common_docker_image.yml +++ b/.github/workflows/common_docker_image.yml @@ -46,7 +46,7 @@ jobs: if: ${{ steps.vars.outputs.is_tag_create == 'true' }} run: | curl -O https://raw.githubusercontent.com/filecoin-project/venus-docs/master/script/dockerfile - docker build . --file dockerfile --build-arg BUILD_TARGET=${{steps.vars.outputs.repo_name}} --tag ${{steps.vars.outputs.docker_user_name}}/${{steps.vars.outputs.repo_name}}:latest + make docker TAG=latest docker tag ${{steps.vars.outputs.docker_user_name}}/${{steps.vars.outputs.repo_name}}:latest ${{steps.vars.outputs.docker_user_name}}/${{steps.vars.outputs.repo_name}}:${{ steps.vars.outputs.github_tag }} docker login --username=${{steps.vars.outputs.docker_user_name}} --password ${{ secrets.DOCKER_PASSWORD }} docker push ${{steps.vars.outputs.docker_user_name}}/${{steps.vars.outputs.repo_name}}:${{ steps.vars.outputs.github_tag }} diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index b8ac374db7..fb01aeec65 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -8,6 +8,6 @@ on: jobs: build_docker_image: - uses: ./.github/workflows/common_docker_image.yml + uses: filecoin-project/venus/.github/workflows/common_docker_image.yml@master secrets: DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} diff --git a/Makefile b/Makefile index a8672a0652..01899ffb63 100644 --- a/Makefile +++ b/Makefile @@ -120,7 +120,7 @@ build: $(BUILD_DEPS) TAG:=test -docker: +docker: $(BUILD_DEPS) curl -O https://raw.githubusercontent.com/filecoin-project/venus-docs/master/script/dockerfile docker build --build-arg https_proxy=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=venus -t venus . docker tag venus:latest filvenus/venus:$(TAG)