From 3fb8b8386f1fa78bbf1be03cc8b04120e64b4cb6 Mon Sep 17 00:00:00 2001 From: "Stephen.James" Date: Mon, 11 Mar 2024 15:20:53 +0000 Subject: [PATCH] Required to preped make targets with $(MAKE) Since rearranging the Makefile for ease of devloper use and understanding. ND-159 --- .gitignore | 1 + Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 806528be..341f2bc3 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ yarn-debug.log* .vscode coverage +.idea /.env /.env.* diff --git a/Makefile b/Makefile index acf29b54..b493000b 100644 --- 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