From 38e8706c91410d7c50b551eda47683ca75218e86 Mon Sep 17 00:00:00 2001
From: Alex Sharov <AskAlexSharov@gmail.com>
Date: Fri, 29 Apr 2022 14:07:39 +0700
Subject: [PATCH] Docker build: make db-tools to depend on git-submodules
 (#4024)

* save

* save

* save

* save

* save
---
 Dockerfile | 3 +--
 Makefile   | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 006dd7bcd..a9836e39f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,7 @@ RUN apk --no-cache add make gcc g++ linux-headers git bash ca-certificates libgc
 WORKDIR /app
 ADD . .
 
-# expect that host run `git submodule update --init`
-RUN make erigon rpcdaemon integration sentry txpool downloader hack db-tools
+RUN make erigon rpcdaemon integration sentry txpool downloader hack observer db-tools
 
 FROM docker.io/library/alpine:3.15
 
diff --git a/Makefile b/Makefile
index 4845587a9..fd582228c 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ go-version:
 		exit 1 ;\
 	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}' .
 
 xdg_data_home :=  ~/.local/share
@@ -74,7 +74,7 @@ $(COMMANDS): %: %.cmd
 
 all: erigon $(COMMANDS)
 
-db-tools:
+db-tools: git-submodules
 	@echo "Building db-tools"
 
 	# 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
 
 git-submodules:
+	@[ -d ".git" ] || (echo "Not a git repository" && exit 1)
 	@echo "Updating git submodules"
 	@# Dockerhub using ./hooks/post-checkout to set submodules, so this line will fail on Dockerhub
 	@git submodule update --quiet --init --recursive --force || true