Merge pull request #165 from magento-commerce/MCLOUD-14015

MCLOUD-14015:Cloud Docker fixes

Author: andriyShevtsov

tests/functional/Codeception/Docker.php

@@ -108,8 +108,8 @@ public function runDockerComposeCommand(string $command): bool
     public function resetFilesOwner(): bool
     {
         return $this->runDockerComposeCommand(
-            'run build bash -c "chown -R $(id -u):$(id -g) . /composer/cache"'
-        );
+            'run --user root build bash -c "uid=$(stat -c %u . 2>/dev/null || stat -f %u .); gid=$(stat -c %g . 2>/dev/null || stat -f %g .); chown -R $uid:$gid . /composer/cache"'
+        ); 
     }
 
     /**

tests/functional/Robo/Tasks/CopyFromDocker.php

@@ -80,7 +80,10 @@ public function destination(string $destination): self
     public function getCommand(): string
     {
         return sprintf(
-            'docker cp "$(docker-compose ps -q %s)":%s %s',
+            '(docker-compose cp %s:%s %s) || (docker cp $(docker-compose ps -q %s):%s %s)',
+            $this->container,
+            $this->source,
+            $this->destination,
             $this->container,
             $this->source,
             $this->destination
@@ -108,4 +111,4 @@ public function run(): Result
 
         return $this->executeCommand($this->getCommand());
     }
-}
+}

tests/functional/Robo/Tasks/CopyToDocker.php

@@ -80,7 +80,10 @@ public function destination(string $destination): self
     public function getCommand(): string
     {
         return sprintf(
-            'docker cp "$(docker-compose ps -q %s)":%s %s',
+            '(docker-compose cp %s:%s %s) || (docker cp $(docker-compose ps -q %s):%s %s)',
+            $this->source,
+            $this->container,
+            $this->destination,
             $this->source,
             $this->container,
             $this->destination
@@ -102,4 +105,4 @@ public function run(): Result
 
         return $this->executeCommand($this->getCommand());
     }
-}
+}