Tooling: dynamic container name to remove confusion created by multiple forks - 2

Author: SOHELAHMED7

Makefile

@@ -15,8 +15,8 @@ DOCKER_PHP=docker-compose run --rm php
 DOCKER_NODE=docker-compose run --rm -w /app node
 endif
 
-CONTAINER_NAME=$$(echo $$(pwd) | tr / _)
-
+CONTAINER_NAME=$$(echo $$(pwd) | tr / _ | cut -c 2-)
+UID=$(shell id -u)
 
 all:
 	@echo "the following commands are available:"
@@ -36,10 +36,10 @@ check-style: php-cs-fixer.phar
 	PHP_CS_FIXER_IGNORE_ENV=1 ./php-cs-fixer.phar fix src/ --diff --dry-run
 
 cli:
-	docker-compose exec --user=$(shell id -u) php bash
+	COMPOSE_PROJECT_NAME=$(CONTAINER_NAME) docker-compose exec --user=$(UID) php bash
 
 cli_root:
-	docker-compose exec --user="root" php bash
+	COMPOSE_PROJECT_NAME=$(CONTAINER_NAME) docker-compose exec --user="root" php bash
 
 fix-style: php-cs-fixer.phar
 	$(DOCKER_PHP) vendor/bin/indent --tabs composer.json
@@ -90,11 +90,13 @@ coverage: .php-openapi-covA .php-openapi-covB
 .php-openapi-covB:
 	grep -rhPo '^class \w+' src/spec/ | awk '{print $$2}' |grep -v '^Type$$' | sort > $@
 
-docker-compose.override.yml: docker-compose.override.dist.yml
-	test -f $@ || cp $< $@
+build-docker:
+	COMPOSE_PROJECT_NAME=$(CONTAINER_NAME) docker-compose build
 
-start-docker: docker-compose.override.yml
-	CONTAINER_NAME=$(CONTAINER_NAME) docker-compose up -d
+start-docker:
+	COMPOSE_PROJECT_NAME=$(CONTAINER_NAME) docker-compose up -d
 
-.PHONY: all check-style fix-style install test lint coverage
+stop-docker:
+	COMPOSE_PROJECT_NAME=$(CONTAINER_NAME) docker-compose down --remove-orphans
 
+.PHONY: all check-style fix-style install test lint coverage build-docker start-docker stop-docker