Allow configuring top-level networks

Author: elnurvl

src/Console/Concerns/InteractsWithDockerComposeServices.php

@@ -79,6 +79,19 @@ protected function buildDockerCompose(array $services)
                 }
             });
 
+        // Merge networks
+        $compose['networks'] = collect(Sail::networks())->merge($compose['networks'] ?? [])->toArray();
+
+        foreach ($compose['networks'] ?? [] as $name => $network) {
+            if ($network['external'] ?? false) {
+                exec("docker network ls --filter name=^" . escapeshellarg($name) . "$ -q", $check);
+                if (empty($check)) {
+                    exec("docker network create --driver bridge " . escapeshellarg($name), $output);
+                    $this->components->info("$name network has been created.");
+                }
+            }
+        }
+
         // Merge volumes...
         collect($services)
             ->filter(function ($service) {

src/Sail.php

@@ -8,10 +8,12 @@
 /**
  * @method static self setBaseTemplate(string $stub)
  * @method static self addService(string $service, ?string $stubPath = null, ?bool $persistent = null, ?bool $default = null, ?bool $dependency = null, ?Closure $configuringEnv = null, ?Closure $afterInstall = null)
+ * @method static self addNetwork(array $network)
  * @method static self registerInstallHook(Closure $closure)
  * @method static self registerPublishHook(Closure $closure)
  * @method static string baseTemplate()
  * @method static array availableServices(bool $default = false)
+ * @method static array networks()
  * @method static string stub(string $service)
  * @method static bool isPersistent(string $service)
  * @method static bool isDependedOn(string $service)

src/Services.php

@@ -52,6 +52,17 @@ class Services
         'soketi',
     ];
 
+    /**
+     * The networks services communicating on
+     *
+     * @var array<string, array<string, string|bool>>
+     */
+    protected array $networks = [
+        'sail' => [
+            'driver' => 'bridge',
+        ]
+    ];
+
     /**
      * Path to the base docker compose template
      *
@@ -252,6 +263,17 @@ public function addService(string   $service,
         return $this;
     }
 
+    /**
+     * @param array<string, string|bool> $network
+     * @return $this
+     */
+    public function addNetwork(array $network): self
+    {
+        $this->networks = array_merge($this->networks, $network);
+
+        return $this;
+    }
+
     /**
      * Add a hook to the pipeline executed during the installation command.
      *
@@ -304,6 +326,16 @@ public function availableServices(bool $default = false): array
         return $services;
     }
 
+    /**
+     * Get the list of networks defined for the docker-compose file
+     *
+     * @return array
+     */
+    public function networks(): array
+    {
+        return $this->networks;
+    }
+
     /**
      * Get the stub path for a given service.
      *

stubs/docker-compose.stub

@@ -22,6 +22,3 @@ services:
             - '.:/var/www/html'
         networks:
             - sail
-networks:
-    sail:
-        driver: bridge