mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2025-01-03 01:27:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Docker build: make db-tools to depend on git-submodules (#4024)

Browse Source 
* save

* save

* save

* save

* save
This commit is contained in:
Alex Sharov 2022-04-29 14:07:39 +07:00 committed by GitHub
parent 285c782b1b
commit 38e8706c91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -6,8 +6,7 @@ RUN apk --no-cache add make gcc g++ linux-headers git bash ca-certificates libgc
WORKDIR /app WORKDIR /app
ADD . . ADD . .
# expect that host run `git submodule update --init` RUN make erigon rpcdaemon integration sentry txpool downloader hack observer db-tools
RUN make erigon rpcdaemon integration sentry txpool downloader hack db-tools
FROM docker.io/library/alpine:3.15 FROM docker.io/library/alpine:3.15

5
Makefile
View File

@ -29,7 +29,7 @@ go-version:
exit 1 ;\ exit 1 ;\
fi fi
docker: docker: git-submodules
DOCKER_BUILDKIT=1 docker build -t erigon:latest --build-arg git_commit='${GIT_COMMIT}' --build-arg git_branch='${GIT_BRANCH}' --build-arg git_tag='${GIT_TAG}' . DOCKER_BUILDKIT=1 docker build -t erigon:latest --build-arg git_commit='${GIT_COMMIT}' --build-arg git_branch='${GIT_BRANCH}' --build-arg git_tag='${GIT_TAG}' .
xdg_data_home := ~/.local/share xdg_data_home := ~/.local/share
@ -74,7 +74,7 @@ $(COMMANDS): %: %.cmd
all: erigon $(COMMANDS) all: erigon $(COMMANDS)
db-tools: db-tools: git-submodules
@echo "Building db-tools" @echo "Building db-tools"
# hub.docker.com setup incorrect gitpath for git modules. Just remove it and re-init submodule. # hub.docker.com setup incorrect gitpath for git modules. Just remove it and re-init submodule.
@ -137,6 +137,7 @@ escape:
cd $(path) && go test -gcflags "-m -m" -run none -bench=BenchmarkJumpdest* -benchmem -memprofile mem.out cd $(path) && go test -gcflags "-m -m" -run none -bench=BenchmarkJumpdest* -benchmem -memprofile mem.out
git-submodules: git-submodules:
@[ -d ".git" ] || (echo "Not a git repository" && exit 1)
@echo "Updating git submodules" @echo "Updating git submodules"
@# Dockerhub using ./hooks/post-checkout to set submodules, so this line will fail on Dockerhub @# Dockerhub using ./hooks/post-checkout to set submodules, so this line will fail on Dockerhub
@git submodule update --quiet --init --recursive --force || true @git submodule update --quiet --init --recursive --force || true