Merge pull request #3 from webteractive/fix-docker-compose-commands

hadefication · web-flow · commit 7eb85f324cca · 2023-05-19T16:06:36.000+08:00
Fix docker compose commands
diff --git a/devstack b/devstack
@@ -8,28 +8,30 @@ if (file_exists($autoload = __DIR__ . '/vendor/autoload.php')) {
 }
 
 use Webteractive\Devstack\App;
-use Webteractive\Devstack\Commands\MySql;
+use Webteractive\Devstack\Commands\Wp;
+use Webteractive\Devstack\Commands\Php;
+use Webteractive\Devstack\Commands\Init;
 use Webteractive\Devstack\Commands\Redis;
+use Webteractive\Devstack\Commands\MySql;
 use Webteractive\Devstack\Commands\Shell;
 use Webteractive\Devstack\Commands\Config;
-use Webteractive\Devstack\Commands\InitStack;
-use Webteractive\Devstack\Commands\RunPhpCommand;
-use Webteractive\Devstack\Commands\DownloadRuntimes;
-use Webteractive\Devstack\Commands\RunComposerCommands;
+use Webteractive\Devstack\Commands\Artisan;
+use Webteractive\Devstack\Commands\Download;
+use Webteractive\Devstack\Commands\Composer;
 use Webteractive\Devstack\RegisterDockerComposeCommands;
-use Webteractive\Devstack\Commands\RunLaravelArtisanCommand;
 
-$app = new App('Devstack', '1.1.7');
+$app = new App('Devstack', '1.1.8');
 
-$app->add(new InitStack);
+$app->add(new Init);
 $app->add(new Config);
-$app->add(new DownloadRuntimes);
-$app->add(new RunLaravelArtisanCommand);
-$app->add(new RunPhpCommand);
-$app->add(new RunComposerCommands);
+$app->add(new Download);
+$app->add(new Artisan);
+$app->add(new Php);
+$app->add(new Composer);
 $app->add(new Shell);
 $app->add(new MySql);
 $app->add(new Redis);
+$app->add(new Wp);
 
 RegisterDockerComposeCommands::register($app);
 
diff --git a/src/Commands/Artisan.php b/src/Commands/Artisan.php
@@ -5,12 +5,12 @@
 use Webteractive\Devstack\Process;
 use Webteractive\Devstack\WithSignalHandlers;
 
-class RunLaravelArtisanCommand extends Base
+class Artisan extends Base
 {
     use WithSignalHandlers;
 
     protected $signature = 'artisan';
-    protected $description = 'Run Laravel\'s artisan command.';
+    protected $description = 'Run <info>Laravel\'s artisan</info> command within the <info>app</info> container.';
 
     public function shouldIgnoreValidationErrors(): bool
     {
@@ -35,7 +35,9 @@ public function handle(): int
             $process = Process::prepare(array_merge($command, $this->fullCommandSignature))
         );
 
-        $process->setTty(true)->run();
+        $process->setTimeout(null)
+            ->setTty(true)
+            ->run();
 
         return static::SUCCESS;
     }
diff --git a/src/Commands/Composer.php b/src/Commands/Composer.php
@@ -5,12 +5,12 @@
 use Webteractive\Devstack\Process;
 use Webteractive\Devstack\WithSignalHandlers;
 
-class RunComposerCommands extends Base
+class Composer extends Base
 {
     use WithSignalHandlers;
 
     protected $signature = 'composer';
-    protected $description = 'Run composer commands.';
+    protected $description = 'Run <info>composer</info> commands within the <info>app</info> container.';
 
     public function shouldIgnoreValidationErrors(): bool
     {
@@ -35,7 +35,9 @@ public function handle(): int
             $process = Process::prepare(array_merge($command, $this->fullCommandSignature))
         );
 
-        $process->setTty(true)->run();
+        $process->setTimeout(null)
+            ->setTty(true)
+            ->run();
 
         return static::SUCCESS;
     }
diff --git a/src/Commands/Config.php b/src/Commands/Config.php
@@ -9,7 +9,7 @@ class Config extends Base
     use ShouldConfigure;
 
     protected $signature = 'config';
-    protected $description = 'Configure Devstack runtime settings';
+    protected $description = 'Configure private devstack runtime settings.';
 
     public function handle(): int
     {
diff --git a/src/Commands/DockerCompose.php b/src/Commands/DockerCompose.php
@@ -3,9 +3,10 @@
 namespace Webteractive\Devstack\Commands;
 
 use Webteractive\Devstack\Process;
+use Symfony\Component\Process\Process as SymfonyProcess;
 use Webteractive\Devstack\WithSignalHandlers;
 
-class RunDockerCommands extends Base
+class DockerCompose extends Base
 {
     use WithSignalHandlers;
 
@@ -30,7 +31,9 @@ public function handle(): int
             $process = Process::prepare($commandSignature)
         );
 
-        $process->setTty(true)->run();
+        $process->setTimeout(null)
+            ->setTty(true)
+            ->run();
 
         return static::SUCCESS;
     }
diff --git a/src/Commands/Download.php b/src/Commands/Download.php
@@ -5,12 +5,12 @@
 use Webteractive\Devstack\ShouldConfigure;
 use Webteractive\Devstack\RuntimeDownloader;
 
-class DownloadRuntimes extends Base
+class Download extends Base
 {
     use ShouldConfigure;
 
     protected $signature = 'download';
-    protected $description = 'Download latest runtimes';
+    protected $description = 'Download latest private runtimes.';
 
     public function handle(): int
     {
diff --git a/src/Commands/Init.php b/src/Commands/Init.php
@@ -7,7 +7,7 @@
 use Webteractive\Devstack\RuntimeDownloader;
 use Webteractive\Devstack\PublicRuntimeDownloader;
 
-class InitStack extends Base
+class Init extends Base
 {
     use ShouldConfigure;
 
diff --git a/src/Commands/MySql.php b/src/Commands/MySql.php
@@ -15,7 +15,7 @@ class MySql extends Base
                             {--u|user= : The user to use.}
                             {--db|database= : The database to use.}
                             {--env= : The path to the .env file. Default\'s to the current working directory.}';
-    protected $description = 'Start a MySQL CLI session within the <comment>mysql</comment> container.';
+    protected $description = 'Start a <info>MySQL CLI</info> session within the <info>mysql</info> container.';
 
     public function handle(): int
     {
@@ -70,8 +70,7 @@ public function handle(): int
         );
 
         $process->setTty(true)
-            ->setTimeout(60 * 60 * 2)
-            ->setIdleTimeout(60 * 60 * 8)
+            ->setTimeout(null)
             ->run();
 
         return static::SUCCESS;
diff --git a/src/Commands/Php.php b/src/Commands/Php.php
@@ -5,12 +5,12 @@
 use Webteractive\Devstack\Process;
 use Webteractive\Devstack\WithSignalHandlers;
 
-class RunPhpCommand extends Base
+class Php extends Base
 {
     use WithSignalHandlers;
 
     protected $signature = 'php';
-    protected $description = 'Run PHP commands.';
+    protected $description = 'Run <info>PHP</info> CLI within the <info>app</info> container.';
 
     public function shouldIgnoreValidationErrors(): bool
     {
@@ -34,7 +34,9 @@ public function handle(): int
             $process = Process::prepare(array_merge($command, $this->fullCommandSignature))
         );
 
-        $process->setTty(true)->run();
+        $process->setTimeout(null)
+            ->setTty(true)
+            ->run();
 
         return static::SUCCESS;
     }
diff --git a/src/Commands/Redis.php b/src/Commands/Redis.php
@@ -10,7 +10,7 @@ class Redis extends Base
     use WithSignalHandlers;
 
     protected $signature = 'redis';
-    protected $description = 'Start a Redis CLI session within the <comment>redis</comment> container.';
+    protected $description = 'Start a <info>Redis CLI</info> session within the <info>redis</info> container.';
 
     public function handle(): int
     {
@@ -20,8 +20,7 @@ public function handle(): int
         );
 
         $process->setTty(true)
-            ->setTimeout(60 * 60 * 2)
-            ->setIdleTimeout(60 * 60 * 8)
+            ->setTimeout(null)
             ->run();
 
         return static::SUCCESS;
diff --git a/src/Commands/Shell.php b/src/Commands/Shell.php
@@ -10,7 +10,7 @@ class Shell extends Base
     use WithSignalHandlers;
 
     protected $signature = 'shell {--r|root : As a root user.}';
-    protected $description = 'Start a shell session within the application container';
+    protected $description = 'Start a shell session within the <info>app</info> container.';
 
     public function handle(): int
     {
@@ -30,8 +30,7 @@ public function handle(): int
         );
 
         $process->setTty(true)
-            ->setTimeout(60 * 60 * 2)
-            ->setIdleTimeout(60 * 60 * 8)
+            ->setTimeout(null)
             ->run();
 
         return static::SUCCESS;
diff --git a/src/Commands/Wp.php b/src/Commands/Wp.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Webteractive\Devstack\Commands;
+
+use Webteractive\Devstack\Process;
+use Webteractive\Devstack\WithSignalHandlers;
+
+class Wp extends Base
+{
+    use WithSignalHandlers;
+
+    protected $signature = 'wp';
+    protected $description = 'Run <info>WordPress CLI</info> commands within the <info>app</info> container.';
+
+    public function shouldIgnoreValidationErrors(): bool
+    {
+        return true;
+    }
+
+    public function handle(): int
+    {
+        $command = [
+            'docker',
+            'compose',
+            'exec',
+            '-u',
+            'dev',
+            '-T',
+            'app',
+            'wp',
+        ];
+
+        $this->handleTerminationSignals(
+            $process = Process::prepare(array_merge($command, $this->fullCommandSignature))
+        );
+
+        $process->setTimeout(null)
+            ->setTty(true)
+            ->run();
+
+        return static::SUCCESS;
+    }
+}
diff --git a/src/RegisterDockerComposeCommands.php b/src/RegisterDockerComposeCommands.php
@@ -3,7 +3,7 @@
 namespace Webteractive\Devstack;
 
 use Symfony\Component\Console\Application;
-use Webteractive\Devstack\Commands\RunDockerCommands;
+use Webteractive\Devstack\Commands\DockerCompose;
 
 class RegisterDockerComposeCommands
 {
@@ -38,7 +38,7 @@ class RegisterDockerComposeCommands
     public static function register(Application $app, $prefix = 'runtime')
     {
         foreach (static::$commands as $name => $description) {
-            $app->add(new RunDockerCommands($name, $description));
+            $app->add(new DockerCompose($name, '<comment>[Docker Compose]</comment> ' . $description));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class Config extends Base`
`9`	`9`	`use ShouldConfigure;`
`10`	`10`
`11`	`11`	`protected $signature = 'config';`
`12`		`- protected $description = 'Configure Devstack runtime settings';`
	`12`	`+ protected $description = 'Configure private devstack runtime settings.';`
`13`	`13`
`14`	`14`	`public function handle(): int`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@`
`5`	`5`	`use Webteractive\Devstack\ShouldConfigure;`
`6`	`6`	`use Webteractive\Devstack\RuntimeDownloader;`
`7`	`7`
`8`		`-class DownloadRuntimes extends Base`
	`8`	`+class Download extends Base`
`9`	`9`	`{`
`10`	`10`	`use ShouldConfigure;`
`11`	`11`
`12`	`12`	`protected $signature = 'download';`
`13`		`- protected $description = 'Download latest runtimes';`
	`13`	`+ protected $description = 'Download latest private runtimes.';`
`14`	`14`
`15`	`15`	`public function handle(): int`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Webteractive\Devstack\RuntimeDownloader;`
`8`	`8`	`use Webteractive\Devstack\PublicRuntimeDownloader;`
`9`	`9`
`10`		`-class InitStack extends Base`
	`10`	`+class Init extends Base`
`11`	`11`	`{`
`12`	`12`	`use ShouldConfigure;`
`13`	`13`