From 1e4597c6ef59e23068543782db409877648c6f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= <dalibor.karlovic@sigwin.hr>
Date: Fri, 21 Feb 2025 10:41:47 +0100
Subject: [PATCH] fix: make the in-container path the same as host path

---
 resources/Node/common.mk             | 2 +-
 resources/PHP/common.mk              | 2 +-
 resources/YASSG/compat.mk            | 2 +-
 tests/functional/Node/CommonTest.php | 2 +-
 tests/functional/PHP/PhpTrait.php    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/Node/common.mk b/resources/Node/common.mk
index e6d4999..bb1567c 100644
--- a/resources/Node/common.mk
+++ b/resources/Node/common.mk
@@ -14,7 +14,7 @@ NODE_DOCKER_IMAGE=node:${NODE_VERSION}-alpine
 endif
 
 ifndef NODE_DOCKER_COMMAND
-NODE_DOCKER_COMMAND=docker run --init --interactive ${DOCKER_TTY} --rm ${DOCKER_ENV} ${DOCKER_USER} --volume "$(DOCKER_CWD):/project" --volume "${HOME}/.npm:/home/node/.npm" --workdir /project ${NODE_DOCKER_IMAGE}
+NODE_DOCKER_COMMAND=docker run --init --interactive ${DOCKER_TTY} --rm ${DOCKER_ENV} ${DOCKER_USER} --volume "$(DOCKER_CWD):$(DOCKER_CWD)" --volume "${HOME}/.npm:/home/node/.npm" --workdir "$(DOCKER_CWD)" ${NODE_DOCKER_IMAGE}
 endif
 
 sh/node: | ${HOME}/.npm ## Run Node shell
diff --git a/resources/PHP/common.mk b/resources/PHP/common.mk
index e92ec82..db500be 100644
--- a/resources/PHP/common.mk
+++ b/resources/PHP/common.mk
@@ -14,7 +14,7 @@ PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.102.0-php${PHP_VERSION}-alpine
 endif
 
 ifndef PHPQA_DOCKER_COMMAND
-PHPQA_DOCKER_COMMAND=docker run --init --interactive ${DOCKER_TTY} --rm ${DOCKER_ENV} --env "COMPOSER_CACHE_DIR=/composer/cache" ${DOCKER_USER} --volume "$(DOCKER_CWD)/var/phpqa:/cache" --volume "$(DOCKER_CWD):/project" --volume "${HOME}/.composer:/composer" --workdir /project ${PHPQA_DOCKER_IMAGE}
+PHPQA_DOCKER_COMMAND=docker run --init --interactive ${DOCKER_TTY} --rm ${DOCKER_ENV} --env "COMPOSER_CACHE_DIR=/composer/cache" ${DOCKER_USER} --volume "$(DOCKER_CWD)/var/phpqa:/cache" --volume "$(DOCKER_CWD):$(DOCKER_CWD)" --volume "${HOME}/.composer:/composer" --workdir "$(DOCKER_CWD)" ${PHPQA_DOCKER_IMAGE}
 endif
 
 sh/php: | ${HOME}/.composer var/phpqa composer.lock ## Run PHP shell
diff --git a/resources/YASSG/compat.mk b/resources/YASSG/compat.mk
index 3523ca1..a01a627 100644
--- a/resources/YASSG/compat.mk
+++ b/resources/YASSG/compat.mk
@@ -11,7 +11,7 @@ LYCHEE_DOCKER_IMAGE=lycheeverse/lychee:0.13.0
 endif
 
 ifndef LYCHEE_DOCKER_COMMAND
-LYCHEE_DOCKER_COMMAND=docker run --init --interactive ${DOCKER_TTY} --rm ${DOCKER_USER} --volume "$(DOCKER_CWD):/project:ro" --workdir /project ${LYCHEE_DOCKER_IMAGE}
+LYCHEE_DOCKER_COMMAND=docker run --init --interactive ${DOCKER_TTY} --rm ${DOCKER_USER} --volume "$(DOCKER_CWD):$(DOCKER_CWD):ro" --workdir "$(DOCKER_CWD)" ${LYCHEE_DOCKER_IMAGE}
 endif
 
 dist: composer/normalize cs analyze/phpstan analyze/psalm test ## Prepare the codebase for commit
diff --git a/tests/functional/Node/CommonTest.php b/tests/functional/Node/CommonTest.php
index 73ade47..ff74a7c 100644
--- a/tests/functional/Node/CommonTest.php
+++ b/tests/functional/Node/CommonTest.php
@@ -51,7 +51,7 @@ protected function getExpectedInitPaths(): array
     private static function generateNodeExecutionPath(string $command, string $nodeVersion, string $dockerImage, string $env): string
     {
         return self::normalize(\sprintf(
-            'docker run --init --interactive  --rm %4$s%2$s --volume "$ROOT:/project" --volume "$HOME/.npm:/home/node/.npm" --workdir /project %3$s %1$s',
+            'docker run --init --interactive  --rm %4$s%2$s --volume "$ROOT:$ROOT" --volume "$HOME/.npm:/home/node/.npm" --workdir "$ROOT" %3$s %1$s',
             \sprintf($command, $nodeVersion),
             self::generateDockerComposeExecutionUser(),
             \sprintf($dockerImage, $nodeVersion),
diff --git a/tests/functional/PHP/PhpTrait.php b/tests/functional/PHP/PhpTrait.php
index 5788ad5..ef97a88 100644
--- a/tests/functional/PHP/PhpTrait.php
+++ b/tests/functional/PHP/PhpTrait.php
@@ -202,7 +202,7 @@ private static function paths(?array $env): array
     private static function generatePhpqaExecutionPath(string $command, string $phpVersion, string $dockerImage, string $env): string
     {
         return self::normalize(\sprintf(
-            'docker run --init --interactive  --rm %4$s--env "COMPOSER_CACHE_DIR=/composer/cache" %2$s --volume "$ROOT/var/phpqa:/cache" --volume "$ROOT:/project" --volume "$HOME/.composer:/composer" --workdir /project %3$s %1$s',
+            'docker run --init --interactive  --rm %4$s--env "COMPOSER_CACHE_DIR=/composer/cache" %2$s --volume "$ROOT/var/phpqa:/cache" --volume "$ROOT:$ROOT" --volume "$HOME/.composer:/composer" --workdir "$ROOT" %3$s %1$s',
             \sprintf($command, $phpVersion),
             self::generateDockerComposeExecutionUser(),
             \sprintf($dockerImage, $phpVersion),