chore: handle docker args flags as well as long flags

Author: chrisneal

src/Docker.php

@@ -62,13 +62,27 @@ public static function buildCommand($project, $environment, $cliDockerArgs, $man
                     return '--build-arg='.escapeshellarg("{$key}={$value}").' ';
                 })->implode('')),
             trim(Collection::make($manifestDockerArgs)
+                ->mapWithKeys(function ($value) {
+                    if (is_array($value)) {
+                        return $value;
+                    }
+
+                    return [$value => null];
+                })
                 ->merge(Collection::make($cliDockerArgs)
                     ->mapWithKeys(function ($value) {
-                        [$key, $value] = explode('=', $value, 2);
+                        if (!str_contains($value, '=')) {
+                            return [$value => null];
+                        }
 
+                        [$key, $value] = explode('=', $value, 2);
                         return [$key => $value];
                     })
                 )->map(function ($value, $key) {
+                    if ($value === null) {
+                        return "--${key} ";
+                    }
+
                     return "--${key}=".escapeshellarg($value).' ';
                 })->implode(''))
         );

tests/DockerTest.php

@@ -59,29 +59,29 @@ public function test_build_command_cli_and_manifest_build_args()
 
     public function test_build_command_cli_docker_args()
     {
-        $cliDockerArgs = ['FOO=BAR', 'FIZZ=BUZZ'];
+        $cliDockerArgs = ['BAR=FOO', 'FIZZ=BAZZ', 'FIZZLE', 'BUZZLE'];
         $command = Docker::buildCommand('my-project', 'production', $cliDockerArgs, [], [], []);
         $expectedCommand = 'docker build --pull --file=production.Dockerfile --tag=my-project:production  '.
-            "--FOO='BAR' --FIZZ='BUZZ' .";
+            "--BAR='FOO' --FIZZ='BAZZ' --FIZZLE --BUZZLE .";
         $this->assertEquals($expectedCommand, $command);
     }
 
     public function test_build_command_manifest_docker_args()
     {
-        $manifestDockerArgs = ['FOO' => 'BAR', 'FIZZ' => 'BUZZ'];
+        $manifestDockerArgs = [['FOO' => 'BAR'], ['FIZZ' => 'BUZZ'], 'FIZZLE', 'BUZZLE'];
         $command = Docker::buildCommand('my-project', 'production', [], $manifestDockerArgs, [], []);
         $expectedCommand = 'docker build --pull --file=production.Dockerfile --tag=my-project:production  '.
-            "--FOO='BAR' --FIZZ='BUZZ' .";
+            "--FOO='BAR' --FIZZ='BUZZ' --FIZZLE --BUZZLE .";
         $this->assertEquals($expectedCommand, $command);
     }
 
     public function test_build_command_cli_and_manifest_docker_args()
     {
-        $cliDockerArgs = ['BAR=FOO', 'FIZZ=BAZZ'];
-        $manifestDockerArgs = ['FOO' => 'BAR', 'FIZZ' => 'BUZZ'];
+        $cliDockerArgs = ['BAR=FOO', 'FIZZ=BAZZ', 'FIZZLE', 'BUZZLE'];
+        $manifestDockerArgs = [['FOO' => 'BAR'], ['FIZZ' => 'BUZZ'], 'FIZZLY', 'BUZZLY'];
         $command = Docker::buildCommand('my-project', 'production', $cliDockerArgs, $manifestDockerArgs, [], []);
         $expectedCommand = 'docker build --pull --file=production.Dockerfile --tag=my-project:production  '.
-            "--FOO='BAR' --FIZZ='BAZZ' --BAR='FOO' .";
+            "--FOO='BAR' --FIZZ='BAZZ' --FIZZLY --BUZZLY --BAR='FOO' --FIZZLE --BUZZLE .";
         $this->assertEquals($expectedCommand, $command);
     }