add extra steps to make clean

CHANGELOG.md

@@ -42,6 +42,7 @@ The types of changes are:
 ### Developer Experience
 
 * Fix randomly failing mssql integration tests [918](https://github.com/ethyca/fidesops/pull/918)
+* Update the way `make clean` works [#767](https://github.com/ethyca/fidesops/pull/767)
 
 ### Docs
 

Makefile

@@ -17,6 +17,9 @@ IMAGE_LATEST := $(REGISTRY)/$(IMAGE_NAME):latest
 
 DOCKERFILE_ENVIRONMENTS := postgres mysql mongodb mssql
 
+DOCKER_CONTAINER_IDS := $(shell docker ps -a -q)
+DOCKER_VOLUME_IDS := $(shell docker volume ls -q)
+
 
 ####################
 # Defaults
@@ -185,6 +188,9 @@ black: compose-build
 .PHONY: clean
 clean:
 	@echo "Cleaning project temporary files and installed dependencies..."
+	@make teardown
+	@docker rm -f $(DOCKER_CONTAINER_IDS) || echo "no containers to remove"
+	@docker volume rm $(DOCKER_VOLUME_IDS) || echo "no volumes to remove"
 	@docker system prune -a --volumes
 	@echo "Clean complete!"
 

docs/fidesops/docs/development/contributing_details.md

@@ -129,6 +129,6 @@ Occasionally when developing you'll run into issues where it's beneficial to rem
 - Stop all running containers: `docker-compose down`
 - Delete all local containers: `docker rm -f $(docker ps -a -q)`
 - Delete all local Docker volumes: `docker volume rm $(docker volume ls -q)`
-- Remove temp. files and installed dependencies: `make clean`
+- Remove temp. files, installed dependencies, all local Docker containers and all local Docker volumes: `make clean`
 - Delete all stopped containers, all networks not used by a container, all dangling images, and all build cache: `docker system prune`
 - Recreate the project: `make compose-build`