fix

defstudio · Jan 21, 2025 · 7b9dc42 · 7b9dc42
1 parent db176b4
commit 7b9dc42
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 9 deletions.
diff --git a/app/Commands/Log/Log.php b/app/Commands/Log/Log.php
@@ -4,6 +4,7 @@
 
     use App\Services\DockerService;
     use App\Services\TerminalService;
+    use Illuminate\Support\Stringable;
     use LaravelZero\Framework\Commands\Command;
 
     /**
@@ -41,7 +42,9 @@ public function handle(TerminalService $terminal, DockerService $docker_service)
             if(empty($service)) return 0;
 
             return $terminal->execute([
-                env('DOCKER_COMPOSE_COMMAND', 'docker compose'),
+                ...((new Stringable(env('DOCKER_COMPOSE_COMMAND', 'docker compose')))
+                    ->explode(' ')
+                    ->toArray()),
                 'logs',
                 '--follow',
                 '--tail=50',

diff --git a/app/Commands/Log/LogAll.php b/app/Commands/Log/LogAll.php
@@ -4,6 +4,7 @@
 
     use App\Services\DockerService;
     use App\Services\TerminalService;
+    use Illuminate\Support\Stringable;
     use LaravelZero\Framework\Commands\Command;
 
     /**
@@ -25,7 +26,9 @@ class LogAll extends Command{
         public function handle(TerminalService $terminal){
 
             return $terminal->execute([
-                env('DOCKER_COMPOSE_COMMAND', 'docker compose'),
+                ...((new Stringable(env('DOCKER_COMPOSE_COMMAND', 'docker compose')))
+                    ->explode(' ')
+                    ->toArray()),
                 'logs',
                 '--follow',
                 '--tail=50',

diff --git a/app/Commands/Pull.php b/app/Commands/Pull.php
@@ -3,6 +3,7 @@
 namespace App\Commands;
 
     use App\Services\TerminalService;
+    use Illuminate\Support\Stringable;
     use LaravelZero\Framework\Commands\Command;
 
     class Pull extends Command{
@@ -32,7 +33,9 @@ public function handle(TerminalService $terminal){
             $this->info('Pulling updated images...');
 
             $exit_code = $terminal->execute([
-                env('DOCKER_COMPOSE_COMMAND', 'docker compose'),
+                ...((new Stringable(env('DOCKER_COMPOSE_COMMAND', 'docker compose')))
+                    ->explode(' ')
+                    ->toArray()),
                 'pull'
             ]);
 

diff --git a/app/Commands/Rebuild.php b/app/Commands/Rebuild.php
@@ -4,6 +4,7 @@
 
 use App\Services\DockerService;
 use App\Services\TerminalService;
+use Illuminate\Support\Stringable;
 use LaravelZero\Framework\Commands\Command;
 
 /**
@@ -58,13 +59,17 @@ public function handle(TerminalService $terminal, DockerService $docker_service)
         $this->info("Rebuilding service: $service_name");
 
         $terminal->execute([
-            env('DOCKER_COMPOSE_COMMAND', 'docker compose'),
+            ...((new Stringable(env('DOCKER_COMPOSE_COMMAND', 'docker compose')))
+                ->explode(' ')
+                ->toArray()),
             'pull',
             $service_name,
         ]);
 
         $terminal->execute([
-            env('DOCKER_COMPOSE_COMMAND', 'docker compose'),
+            ...((new Stringable(env('DOCKER_COMPOSE_COMMAND', 'docker compose')))
+                ->explode(' ')
+                ->toArray()),
             'up',
             '-d',
             '--no-deps',

diff --git a/app/Commands/Shell.php b/app/Commands/Shell.php
@@ -4,6 +4,7 @@
 
     use App\Services\DockerService;
     use App\Services\TerminalService;
+    use Illuminate\Support\Stringable;
     use LaravelZero\Framework\Commands\Command;
 
     /**
@@ -53,7 +54,9 @@ public function handle(TerminalService $terminal, DockerService $docker_service)
             $this->info("Starting shell for container: $service_name");
 
             return $terminal->execute([
-                env('DOCKER_COMPOSE_COMMAND', 'docker compose'),
+                ...((new Stringable(env('DOCKER_COMPOSE_COMMAND', 'docker compose')))
+                    ->explode(' ')
+                    ->toArray()),
                 'exec',
                 $service_name,
                 '/bin/bash',

diff --git a/app/Commands/Start.php b/app/Commands/Start.php
@@ -7,6 +7,7 @@
 use App\Exceptions\ContainerException;
 use App\Services\DockerService;
 use App\Services\TerminalService;
+use Illuminate\Support\Stringable;
 use LaravelZero\Framework\Commands\Command;
 
 class Start extends Command
@@ -43,7 +44,9 @@ public function handle(DockerService $docker_service, TerminalService $terminal)
 
         $this->task('Starting containers', function () use ($terminal) {
             $command = [
-                env('DOCKER_COMPOSE_COMMAND', 'docker compose'),
+                ...((new Stringable(env('DOCKER_COMPOSE_COMMAND', 'docker compose')))
+                    ->explode(' ')
+                    ->toArray()),
                 'up',
                 '-d',
             ];

diff --git a/app/Commands/Stop.php b/app/Commands/Stop.php
@@ -4,6 +4,7 @@
 
     use App\Services\TerminalService;
     use Illuminate\Console\Scheduling\Schedule;
+    use Illuminate\Support\Stringable;
     use LaravelZero\Framework\Commands\Command;
 
     class Stop extends Command{
@@ -33,7 +34,9 @@ public function handle(TerminalService $terminal){
             $this->info('Stopping containers...');
 
             $exit_code = $terminal->execute([
-                env('DOCKER_COMPOSE_COMMAND', 'docker compose'),
+                ...((new Stringable(env('DOCKER_COMPOSE_COMMAND', 'docker compose')))
+                    ->explode(' ')
+                    ->toArray()),
                 'down'
             ]);
 

diff --git a/app/Traits/ExecutesShellCommands.php b/app/Traits/ExecutesShellCommands.php
@@ -5,6 +5,7 @@
 
 use App\Services\DockerService;
 use App\Services\TerminalService;
+use Illuminate\Support\Stringable;
 use LaravelZero\Framework\Commands\Command;
 
 /**
@@ -36,7 +37,9 @@ public function handle(DockerService $docker_service, TerminalService $terminal)
             $this->info('Log into Shell');
 
             return $terminal->execute([
-                env('DOCKER_COMPOSE_COMMAND', 'docker compose'),
+                ...((new Stringable(env('DOCKER_COMPOSE_COMMAND', 'docker compose')))
+                    ->explode(' ')
+                    ->toArray()),
                 'run',
                 '--rm',
                 $target_service,