From 3104badf63dda02563100bb80ff14995e2697276 Mon Sep 17 00:00:00 2001 From: zstadler Date: Fri, 24 Apr 2020 21:29:59 +0300 Subject: [PATCH 1/2] `make generate-qareports` depends on `db-start` (#826) Co-authored-by: Yuri Astrakhan --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 626395c..75928b9 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,7 @@ maputnik-stop: -docker rm -f maputnik_editor .PHONY: generate-qareports -generate-qareports: +generate-qareports: db-start ./qa/run.sh # generate all etl and mapping graphs From ed32b115b3373565266a5e04a84c17a778b14e6b Mon Sep 17 00:00:00 2001 From: zstadler Date: Fri, 24 Apr 2020 21:38:36 +0300 Subject: [PATCH 2/2] Update Makefile (#825) Add `/bin/sh` support Co-authored-by: Yuri Astrakhan --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 75928b9..bef714e 100644 --- a/Makefile +++ b/Makefile @@ -92,10 +92,11 @@ clean: rm -rf build .PHONY: db-destroy +db-destroy: override DC_PROJECT:=$(shell echo $(DC_PROJECT) | tr A-Z a-z) db-destroy: $(DOCKER_COMPOSE) down -v --remove-orphans $(DOCKER_COMPOSE) rm -fv - docker volume ls -q -f "name=^$${DC_PROJECT,,*}_" | $(XARGS) docker volume rm + docker volume ls -q -f "name=^$(DC_PROJECT)_" | $(XARGS) docker volume rm rm -rf cache .PHONY: db-start