Merge pull request #41 from WyriHaximus/correctly-detect-if-in-docker-Makefile

Makefile: correctly detect if in docker

Author: WyriHaximus

Makefile

@@ -3,13 +3,23 @@ SHELL=bash
 
 .PHONY: *
 
+DOCKER_CGROUP:=$(shell cat /proc/1/cgroup | grep docker | wc -l)
+
 ifneq ("$(wildcard /.dockerenv)","")
- DOCKER_RUN=
+ IN_DOCKER=TRUE
+else ifneq ("$(DOCKER_CGROUP)","0")
+IN_DOCKER=TRUE
+else
+ IN_DOCKER=FALSe
+endif
+
+ifeq ("$(IN_DOCKER)","TRUE")
+DOCKER_RUN=
 else
 DOCKER_RUN=docker run --rm -it \
--v `pwd`:`pwd` \
--w `pwd` \
-"wyrihaximusnet/php:7.4-zts-alpine3.11-dev"
+-v "`pwd`:`pwd`" \
+-w "`pwd`" \
+"wyrihaximusnet/php:7.4-zts-alpine3.12-dev"
 endif
 
 all: lint cs-fix cs stan psalm unit infection composer-require-checker composer-unused
@@ -18,16 +28,16 @@ lint:
 $(DOCKER_RUN) vendor/bin/parallel-lint --exclude vendor .
 
 cs:
-$(DOCKER_RUN) vendor/bin/phpcs --parallel=$(nproc)
+$(DOCKER_RUN) vendor/bin/phpcs --parallel=$(shell nproc)
 
 cs-fix:
-$(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(nproc)
+$(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(shell nproc)
 
 stan:
 $(DOCKER_RUN) vendor/bin/phpstan analyse src tests --level max --ansi -c phpstan.neon
 
 psalm:
-$(DOCKER_RUN) vendor/bin/psalm --threads=$(nproc) --shepherd --stats
+$(DOCKER_RUN) vendor/bin/psalm --threads=$(shell nproc) --shepherd --stats
 
 unit:
 $(DOCKER_RUN) vendor/bin/phpunit --colors=always -c phpunit.xml.dist --coverage-text --coverage-html covHtml --coverage-clover ./build/logs/clover.xml
@@ -36,7 +46,7 @@ unit-ci: unit
 if [ -f ./build/logs/clover.xml ]; then wget https://scrutinizer-ci.com/ocular.phar && sleep 3 && php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml; fi
 
 infection:
-$(DOCKER_RUN) vendor/bin/infection --ansi --min-msi=100 --min-covered-msi=100 --threads=$(nproc)
+$(DOCKER_RUN) vendor/bin/infection --ansi --min-msi=100 --min-covered-msi=100 --threads=$(shell nproc)
 
 composer-require-checker:
 $(DOCKER_RUN) vendor/bin/composer-require-checker --ignore-parse-errors --ansi -vvv --config-file=composer-require-checker.json