Merge pull request coollabsio#3758 from MarioZet23/custom-traefik-middleware

andrasbacsai · web-flow · commit 9c2b24b9d089 · 2024-10-08T11:23:04.000+02:00
feat: Custom traefik middlewares v2
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
@@ -332,8 +332,12 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
             if (preg_match('/traefik\.http\.middlewares\.(.*?)(\.|$)/', $item, $matches)) {
                 return $matches[1];
             }
+            if (preg_match('/coolify\.traefik\.middlewares=(.*)/', $item, $matches)) {
+                return explode(',', $matches[1]);
+            }
             return null;
-        })->filter()
+        })->flatten()
+        ->filter()
         ->unique();
     }
     foreach ($domains as $loop => $domain) {

Original file line number	Diff line number	Diff line change
`@@ -332,8 +332,12 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_`
`332`	`332`	`if (preg_match('/traefik\.http\.middlewares\.(.*?)(\.\|$)/', $item, $matches)) {`
`333`	`333`	`return $matches[1];`
`334`	`334`	`}`
	`335`	`+ if (preg_match('/coolify\.traefik\.middlewares=(.*)/', $item, $matches)) {`
	`336`	`+ return explode(',', $matches[1]);`
	`337`	`+ }`
`335`	`338`	`return null;`
`336`		`- })->filter()`
	`339`	`+ })->flatten()`
	`340`	`+ ->filter()`
`337`	`341`	`->unique();`
`338`	`342`	`}`
`339`	`343`	`foreach ($domains as $loop => $domain) {`