Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #287 from lorenzomigliorero/fix/remove-path-prefix

Browse Source 
feat: keep path prefix only if different than /
This commit is contained in:
Mauricio Siu
2024-07-31 21:00:28 -06:00
committed by GitHub
parent 1d91131d9a 1460a667e7
commit 5ad1ba8985
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/dokploy/__test__/traefik/traefik.test.ts
View File

@@ -88,6 +88,17 @@ test("Web entrypoint on http domain", async () => {
); );
expect(router.middlewares).not.toContain("redirect-to-https"); expect(router.middlewares).not.toContain("redirect-to-https");
expect(router.rule).not.toContain("PathPrefix");
});
test("Web entrypoint on http domain with custom path", async () => {
const router = await createRouterConfig(
baseApp,
{ ...baseDomain, path: "/foo", https: false },
"web",
);
expect(router.rule).toContain("PathPrefix(`/foo`)");
}); });
test("Web entrypoint on http domain with redirect", async () => { test("Web entrypoint on http domain with redirect", async () => {

2
apps/dokploy/server/utils/traefik/domain.ts
View File

@@ -77,7 +77,7 @@ export const createRouterConfig = async (
const { host, path, https, uniqueConfigKey } = domain; const { host, path, https, uniqueConfigKey } = domain;
const routerConfig: HttpRouter = { const routerConfig: HttpRouter = {
rule: `Host(\`${host}\`)${path ? ` && PathPrefix(\`${path}\`)` : ""}`, rule: `Host(\`${host}\`)${path !== null && path !== "/" ? ` && PathPrefix(\`${path}\`)` : ""}`,
service: `${appName}-service-${uniqueConfigKey}`, service: `${appName}-service-${uniqueConfigKey}`,
middlewares: [], middlewares: [],
entryPoints: [entryPoint], entryPoints: [entryPoint],