Merge pull request #702 from Dokploy/canary

v0.11.2

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",

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.11.0",
+	"version": "v0.11.2",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",

apps/dokploy/pages/api/stripe/webhook.ts

@@ -88,7 +88,6 @@ export default async function handler(
 				.update(admins)
 				.set({
 					stripeSubscriptionId: newSubscription.id,
-					serversQuantity: 0,
 					stripeCustomerId: newSubscription.customer as string,
 				})
 				.where(eq(admins.stripeCustomerId, newSubscription.customer as string))
@@ -121,12 +120,6 @@ export default async function handler(
 		}
 		case "customer.subscription.updated": {
 			const newSubscription = event.data.object as Stripe.Subscription;
-			await db
-				.update(admins)
-				.set({
-					serversQuantity: newSubscription?.items?.data?.[0]?.quantity ?? 0,
-				})
-				.where(eq(admins.stripeCustomerId, newSubscription.customer as string));
 
 			const admin = await findAdminByStripeCustomerId(
 				newSubscription.customer as string,
@@ -136,8 +129,27 @@ export default async function handler(
 				return res.status(400).send("Webhook Error: Admin not found");
 			}
 
-			const newServersQuantity = admin.serversQuantity;
-			await updateServersBasedOnQuantity(admin.adminId, newServersQuantity);
+			if (newSubscription.status === "active") {
+				await db
+					.update(admins)
+					.set({
+						serversQuantity: newSubscription?.items?.data?.[0]?.quantity ?? 0,
+					})
+					.where(
+						eq(admins.stripeCustomerId, newSubscription.customer as string),
+					);
+
+				const newServersQuantity = admin.serversQuantity;
+				await updateServersBasedOnQuantity(admin.adminId, newServersQuantity);
+			} else {
+				await disableServers(admin.adminId);
+				await db
+					.update(admins)
+					.set({ serversQuantity: 0 })
+					.where(
+						eq(admins.stripeCustomerId, newSubscription.customer as string),
+					);
+			}
 
 			break;
 		}
@@ -148,6 +160,13 @@ export default async function handler(
 				newInvoice.subscription as string,
 			);
 
+			if (suscription.status !== "active") {
+				console.log(
+					`Skipping invoice.payment_succeeded for subscription ${suscription.id} with status ${suscription.status}`,
+				);
+				break;
+			}
+
 			await db
 				.update(admins)
 				.set({
@@ -168,22 +187,29 @@ export default async function handler(
 		}
 		case "invoice.payment_failed": {
 			const newInvoice = event.data.object as Stripe.Invoice;
-			await db
-				.update(admins)
-				.set({
-					serversQuantity: 0,
-				})
-				.where(eq(admins.stripeCustomerId, newInvoice.customer as string));
 
-			const admin = await findAdminByStripeCustomerId(
-				newInvoice.customer as string,
+			const subscription = await stripe.subscriptions.retrieve(
+				newInvoice.subscription as string,
 			);
 
-			if (!admin) {
-				return res.status(400).send("Webhook Error: Admin not found");
+			if (subscription.status !== "active") {
+				const admin = await findAdminByStripeCustomerId(
+					newInvoice.customer as string,
+				);
+
+				if (!admin) {
+					return res.status(400).send("Webhook Error: Admin not found");
+				}
+				await db
+					.update(admins)
+					.set({
+						serversQuantity: 0,
+					})
+					.where(eq(admins.stripeCustomerId, newInvoice.customer as string));
+
+				await disableServers(admin.adminId);
 			}
 
-			await disableServers(admin.adminId);
 			break;
 		}
 

apps/dokploy/pages/index.tsx

@@ -199,7 +199,7 @@ export default function Home({ IS_CLOUD }: Props) {
 								) : (
 									<Link
 										className="hover:underline text-muted-foreground"
-										href="https://docs.dokploy.com/docs/core/get-started/reset-password"
+										href="https://docs.dokploy.com/docs/core/reset-password"
 										target="_blank"
 									>
 										Lost your password?

apps/dokploy/templates/plausible/docker-compose.yml

@@ -26,7 +26,7 @@ services:
         hard: 262144
 
   plausible:
-    image: ghcr.io/plausible/community-edition:v2.1.0
+    image: ghcr.io/plausible/community-edition:v2.1.4
     restart: always
     command: sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"
     depends_on:

apps/dokploy/templates/templates.ts

@@ -34,7 +34,7 @@ export const templates: TemplateData[] = [
 	{
 		id: "plausible",
 		name: "Plausible",
-		version: "v2.1.0",
+		version: "v2.1.4",
 		description:
 			"Plausible is a open source, self-hosted web analytics platform that lets you track website traffic and user behavior.",
 		logo: "plausible.svg",

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`,