feat: #228 add extra worker

ptah-sh · Oct 15, 2024 · 02b349d · 02b349d
1 parent 32f3bfa
commit 02b349d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -83,7 +83,9 @@ jobs:
               workers:
                 - name: main
                   dockerImage: ghcr.io/ptah-sh/ptah-server:${{ needs.release-please.outputs.tag_name }}
-                - name: scheduler
+                - name: schedule_root
+                  dockerImage: ghcr.io/ptah-sh/ptah-server:${{ needs.release-please.outputs.tag_name }}
+                - name: schedule_run
                   dockerImage: ghcr.io/ptah-sh/ptah-server:${{ needs.release-please.outputs.tag_name }}
                 - name: queue
                   dockerImage: ghcr.io/ptah-sh/ptah-server:${{ needs.release-please.outputs.tag_name }}

diff --git a/app/Models/DeploymentData/Process.php b/app/Models/DeploymentData/Process.php
@@ -307,6 +307,12 @@ public function copyWith(array $attributes): static
 
         if (isset($attributes['workers'])) {
             foreach ($attributes['workers'] as $idx => $worker) {
+                if (! isset($worker['name'])) {
+                    $errors["workers.{$idx}.name"] = 'Worker name is required';
+
+                    continue;
+                }
+
                 if (! $this->findWorkerByName($worker['name'])) {
                     $errors["workers.{$idx}.name"] = 'Worker '.$worker['name'].' does not exist';
                 }

diff --git a/app/Policies/ServicePolicy.php b/app/Policies/ServicePolicy.php
@@ -65,6 +65,6 @@ public function forceDelete(User $user, Service $service): bool
 
     public function deploy(User $user, Service $service): bool
     {
-        return $user->belongsToTeam($service->team) && $service->team->hasValidSubscription();
+        return $user->belongsToTeam($service->team) && ($service->team->hasValidSubscription() || $service->team->onTrial());
     }
 }