Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix docker image tagging #1247

Merged
merged 5 commits into from
Mar 2, 2023
Merged

fix docker image tagging #1247

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b441599
fix docker image tagging
nonsense Mar 2, 2023
0adea5a
fixup
nonsense Mar 2, 2023
0905405
make targets to run devnet from project root
nonsense Mar 2, 2023
f2df68d
command for building specific service
nonsense Mar 2, 2023
079759f
update readme
nonsense Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@ ifeq ($(build_lotus),1)
lotus_info_msg=!!! building lotus base image from github: branch/tag $(lotus_version) !!!
override lotus_src_dir=/tmp/lotus-$(lotus_version)
lotus_build_cmd=update/lotus docker/lotus-all-in-one
lotus_base_image=$(docker_user)/lotus-all-in-one:dev
lotus_base_image=$(docker_user)/lotus-all-in-one:$(lotus_version)-debug
else
# v2 (default): using lotus image
lotus_base_image?=filecoin/lotus-all-in-one:$(lotus_version)-debug
lotus_base_image?=$(docker_user)/lotus-all-in-one:$(lotus_version)-debug
lotus_info_msg=using lotus image from dockerhub: $(lotus_base_image)
lotus_build_cmd=info/lotus-all-in-one
endif
Expand All @@ -227,7 +227,8 @@ $(lotus_src_dir):
update/lotus: $(lotus_src_dir)
cd $(lotus_src_dir) && git pull
.PHONY: update/lotus
docker/lotus-all-in-one: info/lotus-all-in-one | $(lotus_src_dir)

docker/lotus-all-in-one: info/lotus-all-in-one | $(lotus_src_dir)
cd $(lotus_src_dir) && $(docker_build_cmd) -f Dockerfile --target lotus-all-in-one \
-t $(lotus_base_image) --build-arg GOFLAGS=-tags=debug .
.PHONY: docker/lotus-all-in-one
Expand Down