Add ability to run docker-compose with defined projects (#37)

consolidation · Mar 24, 2019 · 3a47cf9 · 3a47cf9
1 parent 1f6a8d5
commit 3a47cf9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Transport/DockerComposeTransport.php b/src/Transport/DockerComposeTransport.php
@@ -35,7 +35,7 @@ public function configure(SiteProcess $process)
      */
     public function wrap($args)
     {
-        $transport = ['docker-compose', 'exec'];
+        $transport = $this->getTransport();
         $transportOptions = $this->getTransportOptions();
         $commandToExecute = $this->getCommandToExecute($args);
 
@@ -55,6 +55,19 @@ public function addChdir($cd, $args)
         return $args;
     }
 
+    /**
+     * getTransport returns the transport along with the docker-compose
+     * project in case it is defined.
+     */
+    protected function getTransport()
+    {
+        $transport = ['docker-compose'];
+        if ($project = $this->siteAlias->get('docker.project', '')) {
+            $transport = array_merge($transport, ['-p', $project]);
+        }
+        return array_merge($transport, ['exec']);
+    }
+
     /**
      * getTransportOptions returns the transport options for the tranport
      * mechanism itself

diff --git a/tests/SiteProcessTest.php b/tests/SiteProcessTest.php
@@ -125,6 +125,17 @@ public function siteProcessTestValues()
                 NULL,
             ],
 
+            [
+                "docker-compose -p project exec --workdir src --user root drupal ls -al /path1 /path2",
+                'src',
+                true,
+                ['docker' => ['service' => 'drupal', 'project' => 'project', 'exec' => ['options' => '--user root']]],
+                ['ls', '-al', '/path1', '/path2'],
+                [],
+                [],
+                NULL,
+            ],
+
             [
                 "drush status '--fields=root,uri'",
                 false,