[1.x] Don't error when docker is not available (#468)

* Don't error when docker is not available * Update InstallCommand.php Co-authored-by: Taylor Otwell <[email protected]>
laravel · Aug 17, 2022 · 853dea1 · 853dea1
1 parent 1f870bc
commit 853dea1
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -72,7 +72,7 @@ public function handle()
 
         $this->info('Sail scaffolding installed successfully.');
 
-        return $this->prepareInstallation($services);
+        $this->prepareInstallation($services);
     }
 
     /**
@@ -211,22 +211,23 @@ protected function installDevContainer()
      * Prepare the installation by pulling and building any necessary images.
      *
      * @param  array  $services
-     * @return int|null
+     * @return void
      */
     protected function prepareInstallation($services)
     {
+        // Ensure docker is installed...
+        if ($this->runCommands(['docker info > /dev/null 2>&1']) !== 0) {
+            return;
+        }
+
         $status = $this->runCommands([
             './vendor/bin/sail pull '.implode(' ', $services),
             './vendor/bin/sail build',
         ]);
 
-        if ($status !== 0) {
-            $this->warn('Unable to download and build your Sail images. Is Docker installed and running?');
-
-            return 1;
+        if ($status === 0) {
+            $this->info('Sail images installed successfully.');
         }
-
-        $this->info('Sail images installed successfully.');
     }
 
     /**