Merge branch 'main' into ND-159-dns-dhcp-product-update-makefiles

Makefile

@@ -32,12 +32,12 @@ start-db: ## start database
 
 .PHONY: db-setup
 db-setup: ## setup database
-	start-db 
+	start-db
 	$(DOCKER_COMPOSE) run --rm app ./bin/rails db:drop db:create db:schema:load
 
 .PHONY: serve
-serve: ## stop start database
-	stop 
+serve: ## Start application
+	stop
 	start-db
 	$(DOCKER_COMPOSE) up app
 
@@ -63,15 +63,15 @@ stop: ## docker compose down
 	$(DOCKER_COMPOSE) down
 
 .PHONY: migrate
-migrate: ## run migrate script 
+migrate: ## run migrate script
 	./scripts/migrate.sh
 
 .PHONY: seed
 seed: ## run seed script
 	./scripts/seed.sh
 
 .PHONY: migrate-dev
-migrate-dev: ## run rails migrate dev 
+migrate-dev: ## run rails migrate dev
 	$(DOCKER_COMPOSE) run --rm app bundle exec rake db:migrate
 
 .PHONY: bootstrap
@@ -90,7 +90,7 @@ push: ## push image to ECR
 
 .PHONY: publish
 publish: ## run build and push targets
-	build 
+	build
 	push
 
 .PHONY: lint