Speed-up make execution

- Add CURDIR as it could be missing in non-gnu
- Do not execute docker in pre-condition inside Makefile

Author: andypost

Makefile

@@ -29,6 +29,9 @@ ifeq ($(shell docker-compose config --services | grep mysql),mysql)
 	MYSQL_DIR=$(shell cd docker && realpath $(DB_DATA_DIR))/$(COMPOSE_PROJECT_NAME)_mysql
 endif
 
+# Define current directory only once
+CURDIR=$(shell pwd)
+
 # Execute php container as regular user
 php = docker-compose exec -T --user $(CUID):$(CGID) php ${1}
 # Execute php container as root user
@@ -129,21 +132,16 @@ exec0:
 down:
 	@echo "Removing network & containers for $(COMPOSE_PROJECT_NAME)"
 	@docker-compose down -v --remove-orphans --rmi local
-ifneq ($(shell docker ps -f 'name=$(COMPOSE_PROJECT_NAME)_chrome' --format '{{.Names}}'), )
-	@echo 'Stoping browser driver.'
-	make -s browser_driver_stop
-endif
+	@if [ ! -z "$(shell docker ps -f 'name=$(COMPOSE_PROJECT_NAME)_chrome' --format '{{.Names}}')" ]; then \
+		echo 'Stoping browser driver.' && make -s browser_driver_stop; fi
 
 DIRS = web/core web/libraries web/modules/contrib web/profiles/contrib web/sites web/themes/contrib vendor
 
 ## Totally remove project build folder, docker containers and network
 clean: info
-ifneq ($(shell docker-compose ps -q php),'')
-	$(eval SCAFFOLD = $(shell docker-compose exec -T --user $(CUID):$(CGID) php composer run-script list-scaffold-files | grep -P '^(?!>)'))
-	@for i in $(SCAFFOLD); do if [ -e "web/$$i" ]; then echo "Removing web/$$i..."; rm -rf web/$$i; fi; done
-endif
 	make -s down
-	@for i in $(DIRS); do if [ -d "$$i" ]; then echo "Removing $$i..."; docker run --rm -v $(shell pwd):/mnt $(IMAGE_PHP) sh -c "rm -rf /mnt/$$i"; fi; done
+	$(eval SCAFFOLD = $(shell docker run --rm -v $(CURDIR):/mnt -w /mnt --user $(CUID):$(CGID) $(IMAGE_PHP) composer run-script list-scaffold-files | grep -P '^(?!>)'))
+	@docker run --rm --user 0:0 -v $(CURDIR):/mnt -w /mnt -e RMLIST="$(addprefix web/,$(SCAFFOLD)) $(DIRS)" $(IMAGE_PHP) sh -c 'for i in $$RMLIST; do rm -fr $$i && echo "Removed $$i"; done'
 ifdef MYSQL_DIR
 	@echo "Removing mysql data from $(MYSQL_DIR) ..."
 	docker run --rm --user 0:0 -v $(shell dirname $(MYSQL_DIR)):/mnt $(IMAGE_PHP) sh -c "rm -fr /mnt/`basename $(MYSQL_DIR)`"

scripts/makefile/front.mk

@@ -5,7 +5,7 @@ frontexec = docker run \
 	--rm \
 	--init \
 	-u $(CUID):$(CGID) \
-	-v $(shell pwd)/web/themes/custom/$(THEME_NAME):/app \
+	-v $(CURDIR)/web/themes/custom/$(THEME_NAME):/app \
 	--workdir /app \
 	$(IMAGE_FRONT) ${1}
 
@@ -15,7 +15,7 @@ frontexec-with-port = docker run \
 	--init \
 	-p $(FRONT_PORT):$(FRONT_PORT) \
 	-u $(CUID):$(CGID) \
-	-v $(shell pwd)/web/themes/custom/$(THEME_NAME):/app \
+	-v $(CURDIR)/web/themes/custom/$(THEME_NAME):/app \
 	--workdir /app \
 	$(IMAGE_FRONT) ${1}
 
@@ -24,7 +24,7 @@ frontexec-with-interactive = docker run \
 	--rm \
 	--init \
 	-u $(CUID):$(CGID) \
-	-v $(shell pwd)/web/themes/custom/$(THEME_NAME):/app \
+	-v $(CURDIR)/web/themes/custom/$(THEME_NAME):/app \
 	--workdir /app \
 	-it \
 	$(IMAGE_FRONT) ${1}
@@ -37,7 +37,7 @@ clear-front:
 front: | front-install front-build
 
 front-install:
-	@if [ -d $(shell pwd)/web/themes/custom/$(THEME_NAME) ]; then \
+	@if [ -d $(CURDIR)/web/themes/custom/$(THEME_NAME) ]; then \
 		echo "- Theme directory found. Installing yarn dependencies..."; \
 		docker pull $(IMAGE_FRONT); \
 		$(call frontexec, node -v); \
@@ -48,7 +48,7 @@ front-install:
 	fi
 
 front-build:
-	@if [ -d $(shell pwd)/web/themes/custom/$(THEME_NAME) ]; then \
+	@if [ -d $(CURDIR)/web/themes/custom/$(THEME_NAME) ]; then \
 		echo "- Theme directory found. Building front assets..."; \
 		docker pull $(IMAGE_FRONT); \
 		$(call frontexec, node -v); \
@@ -59,7 +59,7 @@ front-build:
 	fi
 
 lintval:
-	@if [ -d $(shell pwd)/web/themes/custom/$(THEME_NAME) ]; then \
+	@if [ -d $(CURDIR)/web/themes/custom/$(THEME_NAME) ]; then \
 		echo "- Theme directory found. Running theme linters..."; \
 		docker pull $(IMAGE_FRONT); \
 		$(call frontexec, node -v); \
@@ -70,7 +70,7 @@ lintval:
 	fi
 
 lint:
-	@if [ -d $(shell pwd)/web/themes/custom/$(THEME_NAME) ]; then \
+	@if [ -d $(CURDIR)/web/themes/custom/$(THEME_NAME) ]; then \
 		echo "- Theme directory found. Running theme linters with fix..."; \
 		docker pull $(IMAGE_FRONT); \
 		$(call frontexec, node -v); \
@@ -82,7 +82,7 @@ lint:
 	fi
 
 storybook:
-	@if [ -d $(shell pwd)/web/themes/custom/$(THEME_NAME) ]; then \
+	@if [ -d $(CURDIR)/web/themes/custom/$(THEME_NAME) ]; then \
 		echo "- Theme directory found. Running dynamic storybook..."; \
 		docker pull $(IMAGE_FRONT); \
 		$(call frontexec, node -v); \
@@ -95,7 +95,7 @@ storybook:
 	fi
 
 build-storybook:
-	@if [ -d $(shell pwd)/web/themes/custom/$(THEME_NAME) ]; then \
+	@if [ -d $(CURDIR)/web/themes/custom/$(THEME_NAME) ]; then \
 		echo "- Theme directory found. Exporting static storybook..."; \
 		docker pull $(IMAGE_FRONT); \
 		$(call frontexec, node -v); \

scripts/makefile/tests.mk

@@ -1,8 +1,8 @@
 # Function for code sniffer images.
 phpcsexec = docker run --rm \
-	-v $(shell pwd)/web/profiles/$(PROFILE_NAME):/work/profile \
-	-v $(shell pwd)/web/modules/custom:/work/modules \
-	-v $(shell pwd)/web/themes/custom:/work/themes \
+	-v $(CURDIR)/web/profiles/$(PROFILE_NAME):/work/profile \
+	-v $(CURDIR)/web/modules/custom:/work/modules \
+	-v $(CURDIR)/web/themes/custom:/work/themes \
 	skilldlabs/docker-phpcs-drupal ${1} -s --colors \
 	--standard=Drupal,DrupalPractice \
 	--extensions=php,module,inc,install,profile,theme,yml,txt,md,js \
@@ -60,7 +60,7 @@ endif
 compval:
 	@echo "Composer.json validation..."
 	# Can't use --strict cause we need dev versions for d9 compatibility
-	@docker run --rm -v `pwd`:`pwd` -w `pwd` $(IMAGE_PHP) composer validate
+	@docker run --rm -v $(CURDIR):/mnt -w /mnt $(IMAGE_PHP) composer validate
 
 ## Validate hook_update_N()
 hookupdateval: