Merge 9595d8d9c6 into 11007771f0

Fix/wrong destinations api (#8646 )
chore(templates): update n8n templates to 2.10.2 (#8679 )
2026-03-11 08:55:47 +00:00 · 2026-03-07 23:18:04 +01:00 · 2026-03-05 16:32:09 +01:00 · 2026-03-05 16:23:47 +01:00 · 2026-03-05 14:19:00 +01:00 · 2026-03-03 20:57:03 +01:00
7 changed files with 52 additions and 19 deletions
--- a/app/Http/Controllers/Api/ApplicationsController.php
+++ b/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],
--- a/app/Http/Controllers/Api/ServicesController.php
+++ b/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.',
--- a/bootstrap/helpers/parsers.php
+++ b/bootstrap/helpers/parsers.php
@ -1305,19 +1305,18 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
        }
        if (! $isDatabase && $fqdns instanceof Collection && $fqdns->count() > 0) {
            $shouldGenerateLabelsExactly = $resource->destination->server->settings->generate_exact_labels;
-            $uuid = $resource->uuid;
-            $network = data_get($resource, 'destination.network');
+            // Use local variable to avoid mutating $uuid which is used for volume paths
+            $labelUuid = $resource->uuid;
+            $labelNetwork = data_get($resource, 'destination.network');
            if ($isPullRequest) {
-                $uuid = "{$resource->uuid}-{$pullRequestId}";
-            }
-            if ($isPullRequest) {
-                $network = "{$resource->destination->network}-{$pullRequestId}";
+                $labelUuid = "{$resource->uuid}-{$pullRequestId}";
+                $labelNetwork = "{$resource->destination->network}-{$pullRequestId}";
            }
            if ($shouldGenerateLabelsExactly) {
                switch ($server->proxyType()) {
                    case ProxyTypes::TRAEFIK->value:
                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
-                            uuid: $uuid,
+                            uuid: $labelUuid,
                            domains: $fqdns,
                            is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
                            serviceLabels: $serviceLabels,
@ -1329,8 +1328,8 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
                        break;
                    case ProxyTypes::CADDY->value:
                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
-                            network: $network,
-                            uuid: $uuid,
+                            network: $labelNetwork,
+                            uuid: $labelUuid,
                            domains: $fqdns,
                            is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
                            serviceLabels: $serviceLabels,
@ -1344,7 +1343,7 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
                }
            } else {
                $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
-                    uuid: $uuid,
+                    uuid: $labelUuid,
                    domains: $fqdns,
                    is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
                    serviceLabels: $serviceLabels,
@ -1354,8 +1353,8 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
                    image: $image
                ));
                $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
-                    network: $network,
-                    uuid: $uuid,
+                    network: $labelNetwork,
+                    uuid: $labelUuid,
                    domains: $fqdns,
                    is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
                    serviceLabels: $serviceLabels,
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/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>
--- a/templates/compose/n8n-with-postgres-and-worker.yaml
+++ b/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
--- a/templates/compose/n8n-with-postgresql.yaml
+++ b/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
--- a/templates/compose/n8n.yaml
+++ b/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}
Author	SHA1	Message	Date
Jono	2b6f63ad6f	Merge `9595d8d9c6` into `11007771f0`	2026-03-07 23:18:04 +01:00
Andras Bacsai	11007771f0	Fix/wrong destinations api (#8646 ) Some checks failed Staging Build / build-push (aarch64, linux/aarch64, ubuntu-24.04-arm) (push) Has been cancelled Details Staging Build / build-push (amd64, linux/amd64, ubuntu-24.04) (push) Has been cancelled Details Staging Build / merge-manifest (push) Has been cancelled Details	2026-03-05 16:32:09 +01:00
Andras Bacsai	db52a20ed8	chore(templates): update n8n templates to 2.10.2 (#8679 )	2026-03-05 16:23:47 +01:00
Andras Bacsai	8dfb393de0	chore(ui): add container labels header (#8752 ) Some checks are pending Staging Build / build-push (aarch64, linux/aarch64, ubuntu-24.04-arm) (push) Waiting to run Details Staging Build / build-push (amd64, linux/amd64, ubuntu-24.04) (push) Waiting to run Details Staging Build / merge-manifest (push) Blocked by required conditions Details	2026-03-05 14:19:00 +01:00
Cinzya	80be2628d0	chore(ui): add labels header	2026-03-03 20:57:03 +01:00
Jason Trudeau	92cf88070c	Add files via upload Uploaded: /templates/compose/n8n-with-postgres-and-worker.yaml /templates/compose/n8n.yaml /templates/compose/n8n-with-postgresql.yaml	2026-02-27 22:41:52 -05:00
W8jonas	7c5a6bc96c	Fix wrong destination issue on create_service	2026-02-26 23:15:18 -03:00
W8jonas	bf6b3b8c71	Fix wrong destination issue on create_application	2026-02-26 23:15:04 -03:00
Jono	9595d8d9c6	Fix shared volume mapping for preview deployments	2026-02-18 21:34:54 -08:00