fix(backups): leave the .git history of cloned checkouts out of web-server backups

apps/dokploy/__test__/backups/web-server-filters.test.ts

@@ -0,0 +1,75 @@
+import { execSync } from "node:child_process";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
+import { getWebServerBackupFilters } from "@dokploy/server/utils/backups/web-server-filters";
+import { afterEach, describe, expect, it } from "vitest";
+
+const hasRsync = (() => {
+	try {
+		execSync("rsync --version", { stdio: "ignore" });
+		return true;
+	} catch {
+		return false;
+	}
+})();
+
+let root: string | undefined;
+afterEach(() => {
+	if (root) rmSync(root, { recursive: true, force: true });
+	root = undefined;
+});
+
+const backedUpFiles = (files: string[], dropAppNames: string[]) => {
+	root = mkdtempSync(join(tmpdir(), "web-server-filters-"));
+	const src = join(root, "src");
+	const dst = join(root, "dst");
+	mkdirSync(dst);
+	for (const file of files) {
+		mkdirSync(dirname(join(src, file)), { recursive: true });
+		writeFileSync(join(src, file), "x");
+	}
+	const filters = getWebServerBackupFilters(dropAppNames).join(" ");
+	execSync(`rsync -a ${filters} ${src}/ ${dst}/`);
+	return execSync("find . -type f", { cwd: dst })
+		.toString()
+		.trim()
+		.split("\n")
+		.map((file) => file.replace(/^\.\//, ""))
+		.sort();
+};
+
+describe("getWebServerBackupFilters", () => {
+	it("puts drop-app includes before the code/ excludes", () => {
+		expect(getWebServerBackupFilters(["site-abc"])).toEqual([
+			"--include=applications/site-abc/code/\\*\\*\\*",
+			"--exclude='applications/*/code/'",
+			"--exclude='compose/*/code/'",
+		]);
+	});
+
+	it.skipIf(!hasRsync)(
+		"skips git checkouts but keeps drop uploads and service files",
+		() => {
+			const files = backedUpFiles(
+				[
+					"applications/git-app/code/.git/HEAD",
+					"applications/git-app/code/src/index.ts",
+					"applications/git-app/files/config.yml",
+					"applications/drop-app/code/index.html",
+					"compose/stack/code/docker-compose.yml",
+					"compose/stack/files/config.yml",
+					"traefik/traefik.yml",
+				],
+				["drop-app"],
+			);
+
+			expect(files).toEqual([
+				"applications/drop-app/code/index.html",
+				"applications/git-app/files/config.yml",
+				"compose/stack/files/config.yml",
+				"traefik/traefik.yml",
+			]);
+		},
+	);
+});

packages/server/src/utils/backups/web-server-filters.ts

@@ -0,0 +1,13 @@
+import { quote } from "shell-quote";
+
+// rsync filter rules for the web-server backup. Git and raw sources are
+// re-created under */code/ on every deploy, so those checkouts are skipped;
+// drop (zip upload) apps keep theirs, since it is the only copy of their code.
+// Includes must come before the excludes: rsync applies the first match.
+export const getWebServerBackupFilters = (dropAppNames: string[]) => [
+	...dropAppNames.map(
+		(appName) => `--include=${quote([`applications/${appName}/code/***`])}`,
+	),
+	"--exclude='applications/*/code/'",
+	"--exclude='compose/*/code/'",
+];

packages/server/src/utils/backups/web-server.ts

@@ -3,6 +3,8 @@ import { mkdtemp, rm, stat, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { IS_CLOUD, paths } from "@dokploy/server/constants";
+import { db } from "@dokploy/server/db";
+import { applications } from "@dokploy/server/db/schema";
 import {
 	ENCRYPTION_KEY_BACKUP_FILE,
 	exportEncryptionKeys,
@@ -13,10 +15,12 @@ import {
 	updateDeploymentStatus,
 } from "@dokploy/server/services/deployment";
 import { findDestinationById } from "@dokploy/server/services/destination";
+import { eq } from "drizzle-orm";
 import { sendDokployBackupNotifications } from "../notifications/dokploy-backup";
 import { execAsync } from "../process/execAsync";
 import { redactRcloneCredentials } from "./redact";
 import { getBackupTimestamp, getS3Credentials, normalizeS3Path } from "./utils";
+import { getWebServerBackupFilters } from "./web-server-filters";
 
 function formatBytes(bytes?: number) {
 	if (bytes === undefined) return "Unknown size";
@@ -81,8 +85,15 @@ export const runWebServerBackup = async (backup: BackupSchedule) => {
 			writeStream.write(`Cleaning up temp file: ${cleanupCommand}\n`);
 			await execAsync(cleanupCommand);
 
+			const dropApps = await db.query.applications.findMany({
+				columns: { appName: true },
+				where: eq(applications.sourceType, "drop"),
+			});
+			const filters = getWebServerBackupFilters(
+				dropApps.map(({ appName }) => appName),
+			).join(" ");
 			await execAsync(
-				`rsync -a --ignore-errors --no-specials --no-devices --exclude='volume-backups/' --exclude='${ENCRYPTION_KEY_BACKUP_FILE}' ${BASE_PATH}/ ${tempDir}/filesystem/`,
+				`rsync -a --ignore-errors --no-specials --no-devices --exclude='volume-backups/' --exclude='${ENCRYPTION_KEY_BACKUP_FILE}' ${filters} ${BASE_PATH}/ ${tempDir}/filesystem/`,
 			);
 
 			writeStream.write("Copied filesystem to temp directory\n");