Required to preped make targets with $(MAKE)

Since rearranging the Makefile for ease of devloper use and understanding. ND-159
ministryofjustice · Mar 11, 2024 · 3fb8b83 · 3fb8b83
1 parent 7524e32
commit 3fb8b83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,6 +47,7 @@ yarn-debug.log*
 
 .vscode
 coverage
+.idea
 
 /.env
 /.env.*

diff --git a/Makefile b/Makefile
@@ -32,13 +32,13 @@ start-db: ## start database
 
 .PHONY: db-setup
 db-setup: ## setup database
-	start-db
+	$(MAKE) start-db
 	$(DOCKER_COMPOSE) run --rm app ./bin/rails db:drop db:create db:schema:load
 
 .PHONY: serve
 serve: ## Start application
-	stop
-	start-db
+	$(MAKE) stop
+	$(MAKE) start-db
 	$(DOCKER_COMPOSE) up app
 
 # TODO - this is potentially not needed, but we should check by running tests before removing
@@ -90,8 +90,8 @@ push: ## push image to ECR
 
 .PHONY: publish
 publish: ## run build and push targets
-	build
-	push
+	$(MAKE) build
+	$(MAKE) push
 
 .PHONY: lint
 lint: ## lint
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,6 +47,7 @@ yarn-debug.log* @@
     .vscode
     coverage
+    .idea
     /.env
     /.env.*
@@ Expand Down @@