Merge pull request #240 from jolicode/update-traefik-from-2-to-3

Upgrade Traefik from 2 to 3
jolicode · Oct 11, 2023 · 918c4b1 · 918c4b1
2 parents 3e231df + 873efe8
commit 918c4b1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.castor/utils.php b/.castor/utils.php
@@ -39,7 +39,7 @@ function about(): void
             if (!preg_match('{^Host\\(`(?P<hosts>.*)`\\)$}', $router['rule'], $matches)) {
                 continue;
             }
-            $hosts = explode('`, `', $matches['hosts']);
+            $hosts = explode('`) || Host(`', $matches['hosts']);
             $urls = [...$urls, ...$hosts];
         }
     }
@@ -144,7 +144,7 @@ function docker_compose(array $subCommand, Context $c = null, bool $withBuilder
     $c ??= get_context();
 
     $domains = [variable('root_domain'), ...variable('extra_domains')];
-    $domains = '`' . implode('`, `', $domains) . '`';
+    $domains = '`' . implode('`) || Host(`', $domains) . '`';
 
     $c = $c
         ->withTimeout(null)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 4.0.0 (not released yet)
 
+* Upgrade Traefik from v2.7 to v3.0
 * Migrate from Invoke to Castor
 * Add a dockerfile linter
 * Do not store certificates in the router image

diff --git a/infrastructure/docker/services/router/Dockerfile b/infrastructure/docker/services/router/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:v2.7
+FROM traefik:v3.0
 
 COPY traefik /etc/traefik