Try fix docker cache sharing

php-school · May 25, 2024 · 38647c5 · 38647c5
1 parent 01703d4
commit 38647c5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/php-workshop.yml b/.github/workflows/php-workshop.yml
@@ -29,6 +29,9 @@ jobs:
       - name: Install Dependencies
         run: composer update --prefer-dist
 
+      - name: Build docker image
+        run: docker build -t php-workshop .
+
       - name: Run phpunit tests
         run: |
           mkdir -p build/logs

diff --git a/src/Process/DockerProcessFactory.php b/src/Process/DockerProcessFactory.php
@@ -31,7 +31,7 @@ public function create(ProcessInput $processInput): Process
         $mounts = [];
         if ($processInput->getExecutable() === 'composer') {
             //we need to mount a volume for composer cache
-            $mounts[] = $this->composerCacheDir . ':/root/.composer/cache';
+            $mounts[] = $this->composerCacheDir . ':/tmp/composer';
         }
 
         $env = [];
@@ -40,6 +40,9 @@ public function create(ProcessInput $processInput): Process
             $env[] = $key . '=' . $value;
         }
 
+        $env[]  = '-e';
+        $env[]  = 'COMPOSER_HOME=/tmp/composer';
+
         return new Process(
             [
                 ...$this->baseComposeCommand($mounts, $env),
@@ -48,7 +51,11 @@ public function create(ProcessInput $processInput): Process
                 ...$processInput->getArgs(),
             ],
             $this->basePath,
-            ['SOLUTION' => $processInput->getWorkingDirectory()],
+            [
+                'SOLUTION' => $processInput->getWorkingDirectory(),
+                'UID' => getmyuid(),
+                'GID' => getmygid(),
+            ],
             $processInput->getInput(),
             10,
         );
@@ -74,6 +81,8 @@ private function baseComposeCommand(array $mounts, array $env): array
             '-f',
             '.docker/runtime/docker-compose.yml',
             'run',
+            '--user',
+            getmyuid() . ':' . getmygid(),
             '--rm',
             ...$env,
             '-w',