Merge 0164ad5c94 into 11007771f0

Uploaded:

/templates/compose/n8n-with-postgres-and-worker.yaml
/templates/compose/n8n.yaml
/templates/compose/n8n-with-postgresql.yaml

app/Http/Controllers/Api/ApplicationsController.php

@@ -1095,6 +1095,17 @@ class ApplicationsController extends Controller
             return response()->json(['message' => 'Server has multiple destinations and you do not set destination_uuid.'], 400);
         }
         $destination = $destinations->first();
+        if ($destinations->count() > 1 && $request->has('destination_uuid')) {
+            $destination = $destinations->where('uuid', $request->destination_uuid)->first();
+            if (! $destination) {
+                return response()->json([
+                    'message' => 'Validation failed.',
+                    'errors' => [
+                        'destination_uuid' => 'Provided destination_uuid does not belong to the specified server.',
+                    ],
+                ], 422);
+            }
+        }
         if ($type === 'public') {
             $validationRules = [
                 'git_repository' => ['string', 'required', new ValidGitRepositoryUrl],

app/Http/Controllers/Api/ServicesController.php

@@ -377,6 +377,17 @@ class ServicesController extends Controller
             return response()->json(['message' => 'Server has multiple destinations and you do not set destination_uuid.'], 400);
         }
         $destination = $destinations->first();
+        if ($destinations->count() > 1 && $request->has('destination_uuid')) {
+            $destination = $destinations->where('uuid', $request->destination_uuid)->first();
+            if (! $destination) {
+                return response()->json([
+                    'message' => 'Validation failed.',
+                    'errors' => [
+                        'destination_uuid' => 'Provided destination_uuid does not belong to the specified server.',
+                    ],
+                ], 422);
+            }
+        }
         $services = get_service_templates();
         $serviceKeys = $services->keys();
         if ($serviceKeys->contains($request->type)) {
@@ -543,6 +554,17 @@ class ServicesController extends Controller
                 return response()->json(['message' => 'Server has multiple destinations and you do not set destination_uuid.'], 400);
             }
             $destination = $destinations->first();
+            if ($destinations->count() > 1 && $request->has('destination_uuid')) {
+                $destination = $destinations->where('uuid', $request->destination_uuid)->first();
+                if (! $destination) {
+                    return response()->json([
+                        'message' => 'Validation failed.',
+                        'errors' => [
+                            'destination_uuid' => 'Provided destination_uuid does not belong to the specified server.',
+                        ],
+                    ], 422);
+                }
+            }
             if (! isBase64Encoded($request->docker_compose_raw)) {
                 return response()->json([
                     'message' => 'Validation failed.',

resources/views/livewire/project/application/general.blade.php

@@ -527,6 +527,7 @@
                     @endif
                 </div>
 
+                <h3 class="pt-8">Labels</h3>
                 @if ($application->settings->is_container_label_readonly_enabled)
                     <x-forms.textarea readonly disabled label="Container Labels" rows="15" id="customLabels"
                         monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>

templates/compose/n8n-with-postgres-and-worker.yaml

@@ -7,7 +7,7 @@
 
 services:
   n8n:
-    image: n8nio/n8n:2.1.5
+    image: n8nio/n8n:2.10.2
     environment:
       - SERVICE_URL_N8N_5678
       - N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
@@ -54,7 +54,7 @@ services:
       retries: 10
 
   n8n-worker:
-    image: n8nio/n8n:2.1.5
+    image: n8nio/n8n:2.10.2
     command: worker
     environment:
       - GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-UTC}
@@ -122,7 +122,7 @@ services:
       retries: 10
 
   task-runners:
-    image: n8nio/runners:2.1.5
+    image: n8nio/runners:2.10.2
     environment:
       - N8N_RUNNERS_TASK_BROKER_URI=${N8N_RUNNERS_TASK_BROKER_URI:-http://n8n-worker:5679}
       - N8N_RUNNERS_AUTH_TOKEN=$SERVICE_PASSWORD_N8N

templates/compose/n8n-with-postgresql.yaml

@@ -7,7 +7,7 @@
 
 services:
   n8n:
-    image: n8nio/n8n:2.1.5
+    image: n8nio/n8n:2.10.2
     environment:
       - SERVICE_URL_N8N_5678
       - N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
@@ -47,7 +47,7 @@ services:
       retries: 10
 
   task-runners:
-    image: n8nio/runners:2.1.5
+    image: n8nio/runners:2.10.2
     environment:
       - N8N_RUNNERS_TASK_BROKER_URI=${N8N_RUNNERS_TASK_BROKER_URI:-http://n8n:5679}
       - N8N_RUNNERS_AUTH_TOKEN=$SERVICE_PASSWORD_N8N

templates/compose/n8n.yaml

@@ -7,7 +7,7 @@
 
 services:
   n8n:
-    image: n8nio/n8n:2.1.5
+    image: n8nio/n8n:2.10.2
     environment:
       - SERVICE_URL_N8N_5678
       - N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
@@ -38,7 +38,7 @@ services:
       retries: 10
 
   task-runners:
-    image: n8nio/runners:2.1.5
+    image: n8nio/runners:2.10.2
     environment:
       - N8N_RUNNERS_TASK_BROKER_URI=${N8N_RUNNERS_TASK_BROKER_URI:-http://n8n:5679}
       - N8N_RUNNERS_AUTH_TOKEN=${SERVICE_PASSWORD_N8N}

templates/compose/retroassembly.yaml

@@ -0,0 +1,23 @@
+# documentation: https://github.com/arianrhodsandlot/retroassembly
+# slogan: The personal retro game collection cabinet in your browser.
+# category: games
+# tags: retroassembly, retro-games, arcade, self-hosted, gaming
+# logo: svgs/retroassembly.png
+# ports: 8000
+
+services:
+  retroassembly:
+    image: 'arianrhodsandlot/retroassembly:v5.260124.0752'
+    environment:
+      - SERVICE_URL_RETROASSEMBLY_8000
+    volumes:
+      - 'retroassembly-data:/app/data'
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - 'nc -z 127.0.0.1 8000'
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 90s
+