Merge pull request #688 from Dokploy/687-all-custom-domains-are-route…

…d-to-one-application fix(compose): add path prefix inside Host rule
Dokploy · Nov 12, 2024 · b08a2f5 · b08a2f5
2 parents e0fe4e4 + 29ffdf2
commit b08a2f5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/apps/dokploy/__test__/compose/domain/labels.test.ts b/apps/dokploy/__test__/compose/domain/labels.test.ts
@@ -26,7 +26,6 @@ describe("createDomainLabels", () => {
 			"traefik.http.routers.test-app-1-web.entrypoints=web",
 			"traefik.http.services.test-app-1-web.loadbalancer.server.port=8080",
 			"traefik.http.routers.test-app-1-web.service=test-app-1-web",
-			"traefik.http.routers.test-app-1-web.rule=PathPrefix(`/`)",
 		]);
 	});
 
@@ -37,21 +36,21 @@ describe("createDomainLabels", () => {
 			"traefik.http.routers.test-app-1-websecure.entrypoints=websecure",
 			"traefik.http.services.test-app-1-websecure.loadbalancer.server.port=8080",
 			"traefik.http.routers.test-app-1-websecure.service=test-app-1-websecure",
-			"traefik.http.routers.test-app-1-websecure.rule=PathPrefix(`/`)",
 		]);
 	});
 
-	it("shouldn't add the path prefix if is empty", async () => {
+	it("should add the path prefix if is different than / empty", async () => {
 		const labels = await createDomainLabels(
 			appName,
 			{
 				...baseDomain,
-				path: "",
+				path: "/hello",
 			},
 			"websecure",
 		);
+
 		expect(labels).toEqual([
-			"traefik.http.routers.test-app-1-websecure.rule=Host(`example.com`)",
+			"traefik.http.routers.test-app-1-websecure.rule=Host(`example.com`) && PathPrefix(`/hello`)",
 			"traefik.http.routers.test-app-1-websecure.entrypoints=websecure",
 			"traefik.http.services.test-app-1-websecure.loadbalancer.server.port=8080",
 			"traefik.http.routers.test-app-1-websecure.service=test-app-1-websecure",

diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.11.0",
+	"version": "v0.11.1",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",

diff --git a/packages/server/src/utils/docker/domain.ts b/packages/server/src/utils/docker/domain.ts
@@ -259,21 +259,15 @@ export const createDomainLabels = async (
 	domain: Domain,
 	entrypoint: "web" | "websecure",
 ) => {
-	const { host, port, https, uniqueConfigKey, certificateType } = domain;
+	const { host, port, https, uniqueConfigKey, certificateType, path } = domain;
 	const routerName = `${appName}-${uniqueConfigKey}-${entrypoint}`;
 	const labels = [
-		`traefik.http.routers.${routerName}.rule=Host(\`${host}\`)`,
+		`traefik.http.routers.${routerName}.rule=Host(\`${host}\`)${path && path !== "/" ? ` && PathPrefix(\`${path}\`)` : ""}`,
 		`traefik.http.routers.${routerName}.entrypoints=${entrypoint}`,
 		`traefik.http.services.${routerName}.loadbalancer.server.port=${port}`,
 		`traefik.http.routers.${routerName}.service=${routerName}`,
 	];
 
-	if (domain.path) {
-		labels.push(
-			`traefik.http.routers.${routerName}.rule=PathPrefix(\`${domain.path}\`)`,
-		);
-	}
-
 	if (entrypoint === "web" && https) {
 		labels.push(
 			`traefik.http.routers.${routerName}.middlewares=redirect-to-https@file`,