get deployment plan

app/Drivers/Caddy/Caddy2Driver.php

@@ -5,6 +5,7 @@ namespace App\Drivers\Caddy;
 use App\Drivers\GatewayDriver;
 use App\Data\Deployments\Plan;
 use App\Data\Deployments\PlannedStep as Step;
+use App\Enums\DeploymentStatus;
 use App\Models\Service;
 
 class Caddy2Driver extends GatewayDriver
@@ -20,8 +21,15 @@ class Caddy2Driver extends GatewayDriver
         $this->containerName = $containerName;
         $this->containerId = $containerId;
         $this->service = $service;
+    }
 
-        $this->deploymentPlan = new Plan(steps: [
+    public function getDeploymentPlan(string $deploymentHash): Plan
+    {
+        $previousDeployment = $this->service?->deployments()
+            ->where('status', DeploymentStatus::COMPLETED)
+            ->first();
+
+        return new Plan(steps: [
             new Step(
                 name: 'Generate Caddyfile',
                 script: function () {
@@ -36,23 +44,23 @@ class Caddy2Driver extends GatewayDriver
             ),
             new Step(
                 name: 'Run the docker image',
-                script: function () {
+                script: function () use ($previousDeployment, $deploymentHash) {
                     $script = collect();
-                    if ($this->containerName) {
-                        $script->push('docker stop '.$this->containerName.' || true');
+                    if ($this->containerName && $previousDeployment) {
+                        $script->push("docker stop \"{$this->containerName}-{$previousDeployment->hash}\" || true");
                     } elseif ($this->containerId) {
-                        $script->push('docker stop '.$this->containerId.' || true');
+                        $script->push('docker stop ' . $this->containerId . ' || true');
                     }
 
                     $runCommand = 'docker run -d';
                     if ($this->containerName) {
-                        $runCommand .= " --name {$this->containerName}";
+                        $runCommand .= " --name \"{$this->containerName}-{$deploymentHash}\"";
                     }
                     $runCommand .= ' -p 80:80 -p 443:443 caddy:2';
 
                     $script->push($runCommand);
 
-                    return $script->join("\n");
+                    return $script->join(" && ");
                 }
             ),
         ]);

app/Drivers/Driver.php

@@ -9,8 +9,6 @@ abstract class Driver
 {
     public ?Service $service;
 
-    public Plan $deploymentPlan;
-
     public ?string $containerName;
 
     public ?string $containerId;
@@ -20,4 +18,6 @@ abstract class Driver
         ?string $containerId = null,
         ?Service $service = null,
     );
+
+    abstract public function getDeploymentPlan(string $deploymentHash): Plan;
 }

app/Drivers/Postgres/Postgres17Driver.php

@@ -5,6 +5,7 @@ namespace App\Drivers\Postgres;
 use App\Data\Deployments\Plan;
 use App\Data\Deployments\PlannedStep as Step;
 use App\Drivers\DatabaseDriver;
+use App\Enums\DeploymentStatus;
 use App\Models\Service;
 use Illuminate\Support\Str;
 
@@ -19,27 +20,40 @@ class Postgres17Driver extends DatabaseDriver
         public ?array $credentials = null,
     ) {
         $credentials = $credentials ?? $this->defaultCredentials();
+    }
+
+    public function getDeploymentPlan(string $deploymentHash): Plan
+    {
         $user = $credentials['user'] ?? null;
         $password = $credentials['password'] ?? null;
         $db = $credentials['db'] ?? null;
 
-        $this->deploymentPlan = new Plan(steps: [
+        if (!$user || !$password || !$db) {
+            throw new \InvalidArgumentException('Missing required credentials');
+        }
+
+        $previousDeployment = $this->service?->deployments()
+            ->where('status', DeploymentStatus::COMPLETED)
+            ->first();
+
+        return new Plan(steps: [
             new Step(
                 name: 'Run the docker image',
                 secrets: [
                     'password' => $password
                 ],
-                script: function () use ($user, $password, $db) {
+                script: function () use ($user, $password, $db, $previousDeployment, $deploymentHash) {
                     $script = collect();
-                    if ($this->containerName) {
-                        $script->push('docker stop '.$this->containerName.' || true');
+
+                    if ($this->containerName && $previousDeployment) {
+                        $script->push("docker stop \"{$this->containerName}-{$previousDeployment->hash}\" || true");
                     } elseif ($this->containerId) {
-                        $script->push('docker stop '.$this->containerId.' || true');
+                        $script->push('docker stop ' . $this->containerId . ' || true');
                     }
 
                     $runCommand = 'docker run -d';
                     if ($this->containerName) {
-                        $runCommand .= " --name {$this->containerName}";
+                        $runCommand .= " --name \"{$this->containerName}-{$deploymentHash}\"";
                     }
                     if ($password) {
                         $runCommand .= ' -e POSTGRES_PASSWORD=[!password!]';
@@ -54,7 +68,7 @@ class Postgres17Driver extends DatabaseDriver
 
                     $script->push($runCommand);
 
-                    return $runCommand;
+                    return $script->join(" && ");
                 }
             ),
             new Step(

app/Jobs/Services/DeployService.php

@@ -24,13 +24,14 @@ class DeployService implements ShouldQueue
     public function handle(): void
     {
         $driver = $this->service->driver();
+        $deploymentPlan = $driver->getDeploymentPlan($this->deployment->hash);
         $this->service->update([
             'status' => ServiceStatus::INSTALLING,
         ]);
         $this->deployment = $this->service->deployments()->create([
             'status' => DeploymentStatus::PENDING,
         ]);
-        foreach ($driver->deploymentPlan->steps as $index => $plannedStep) {
+        foreach ($deploymentPlan->steps as $index => $plannedStep) {
             $step = $this->deployment->steps()->create([
                 'order' => $index + 1,
                 'status' => DeploymentStatus::PENDING,

app/Models/Deployment.php

@@ -10,6 +10,15 @@ class Deployment extends Model
 {
     protected $guarded = [];
 
+    public static function boot(): void
+    {
+        parent::boot();
+
+        static::creating(function (self $deployment) {
+            $deployment->hash = str()->random(16);
+        });
+    }
+
     protected function casts(): array
     {
         return [