Development makefile improvement: db-reset should work properly

Previously it was difficult to run because it needed a running db
server, but a stopped web.

Now it automatically stops/starts web if needed, so it can be run when
the compose config is already running.

Also improved down to do a graceful stop, so that the pid file doesn't
remain there.

Author: dutow

Makefile

@@ -12,7 +12,7 @@ dev-prod-detach: ## Start dev stack but run Rails in production mode (uses dev c
 	RAILS_ENV=production NODE_ENV=production RAILS_SERVE_STATIC_FILES=1 RAILS_LOG_TO_STDOUT=1 FORCE_SSL=false $(COMPOSE) up -d --build
 
 down: ## Stop dev stack
-	$(COMPOSE) down
+	$(COMPOSE) stop
 	rm -f tmp/pids/server.pid
 
 shell: ## Open a shell in the web container
@@ -27,8 +27,18 @@ test: ## Run RSpec in the web container
 db-migrate: ## Run db:migrate
 	$(COMPOSE) exec web bin/rails db:migrate
 
-db-reset: ## Drop and prepare (create/migrate)
-	$(COMPOSE) run --rm web bin/rails db:drop && bin/rails db:prepare
+db-reset: ## Drop and setup (create/migrate/seed) - stops web if running, restarts after
+	@WEB_WAS_RUNNING=$$($(COMPOSE) ps --status running --format '{{.Service}}' | grep -q '^web$$' && echo 1 || echo 0); \
+	if [ "$$WEB_WAS_RUNNING" = "1" ]; then \
+		echo "Stopping web container..."; \
+		$(COMPOSE) stop web; \
+	fi; \
+	echo "Running db:drop and db:setup..."; \
+	$(COMPOSE) run --rm web bin/rails db:drop db:setup; \
+	if [ "$$WEB_WAS_RUNNING" = "1" ]; then \
+		echo "Restarting web container..."; \
+		$(COMPOSE) start web; \
+	fi
 
 db-import: ## Drop dev DB and import a public dump (env: DUMP=/path/to/public-YYYY-MM.sql.gz)
 	@if [ -z "$(DUMP)" ]; then echo "Set DUMP=/path/to/public-YYYY-MM.sql.gz"; exit 1; fi