Merge branch 'canary' into feat/ntfy

packages/server/src/utils/ai/select-ai-provider.ts

@@ -5,17 +5,16 @@ import { createDeepInfra } from "@ai-sdk/deepinfra";
 import { createMistral } from "@ai-sdk/mistral";
 import { createOpenAI } from "@ai-sdk/openai";
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
-import { createOllama } from "ollama-ai-provider";
+import { createOllama } from "ai-sdk-ollama";
 
-function getProviderName(apiUrl: string) {
+export function getProviderName(apiUrl: string) {
 	if (apiUrl.includes("api.openai.com")) return "openai";
 	if (apiUrl.includes("azure.com")) return "azure";
 	if (apiUrl.includes("api.anthropic.com")) return "anthropic";
 	if (apiUrl.includes("api.cohere.ai")) return "cohere";
 	if (apiUrl.includes("api.perplexity.ai")) return "perplexity";
 	if (apiUrl.includes("api.mistral.ai")) return "mistral";
-	if (apiUrl.includes("localhost:11434") || apiUrl.includes("ollama"))
-		return "ollama";
+	if (apiUrl.includes(":11434") || apiUrl.includes("ollama")) return "ollama";
 	if (apiUrl.includes("api.deepinfra.com")) return "deepinfra";
 	return "custom";
 }

packages/server/src/utils/docker/domain.ts

@@ -254,6 +254,9 @@ export const addDomainToCompose = async (
 				if (!labels.includes("traefik.docker.network=dokploy-network")) {
 					labels.unshift("traefik.docker.network=dokploy-network");
 				}
+				if (!labels.includes("traefik.swarm.network=dokploy-network")) {
+					labels.unshift("traefik.swarm.network=dokploy-network");
+				}
 			}
 		}
 

packages/server/src/utils/docker/utils.ts

@@ -273,6 +273,14 @@ export const prepareEnvironmentVariables = (
 				throw new Error(`Invalid project environment variable: project.${ref}`);
 			});
 		}
+
+		resolvedValue = resolvedValue.replace(/\$\{\{(.*?)\}\}/g, (_, ref) => {
+			if (serviceVars[ref] !== undefined) {
+				return serviceVars[ref];
+			}
+			throw new Error(`Invalid service environment variable: ${ref}`);
+		});
+
 		return `${key}=${resolvedValue}`;
 	});
 

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

@@ -2,11 +2,14 @@ import { findVolumeBackupById } from "@dokploy/server/services/volume-backups";
 import { scheduledJobs, scheduleJob } from "node-schedule";
 import {
 	createDeploymentVolumeBackup,
+	updateDeploymentStatus,
+} from "@dokploy/server/services/deployment";
+import {
 	execAsync,
 	execAsyncRemote,
-	updateDeploymentStatus,
-} from "../..";
+} from "@dokploy/server/utils/process/execAsync";
 import { backupVolume } from "./backup";
+import { getS3Credentials, normalizeS3Path } from "../backups/utils";
 
 export const scheduleVolumeBackup = async (volumeBackupId: string) => {
 	const volumeBackup = await findVolumeBackupById(volumeBackupId);
@@ -20,6 +23,33 @@ export const removeVolumeBackupJob = async (volumeBackupId: string) => {
 	currentJob?.cancel();
 };
 
+const cleanupOldVolumeBackups = async (
+	volumeBackup: Awaited<ReturnType<typeof findVolumeBackupById>>,
+	serverId?: string | null,
+) => {
+	const { keepLatestCount, destination, prefix, volumeName } = volumeBackup;
+
+	if (!keepLatestCount) return;
+
+	try {
+		const rcloneFlags = getS3Credentials(destination);
+		const normalizedPrefix = normalizeS3Path(prefix);
+		const backupFilesPath = `:s3:${destination.bucket}/${normalizedPrefix}`;
+		const listCommand = `rclone lsf ${rcloneFlags.join(" ")} --include \"${volumeName}-*.tar\" :s3:${destination.bucket}/${normalizedPrefix}`;
+		const sortAndPick = `sort -r | tail -n +$((${keepLatestCount}+1)) | xargs -I{}`;
+		const deleteCommand = `rclone delete ${rcloneFlags.join(" ")} ${backupFilesPath}{}`;
+		const fullCommand = `${listCommand} | ${sortAndPick} ${deleteCommand}`;
+
+		if (serverId) {
+			await execAsyncRemote(serverId, fullCommand);
+		} else {
+			await execAsync(fullCommand);
+		}
+	} catch (error) {
+		console.error("Volume backup retention error", error);
+	}
+};
+
 export const runVolumeBackup = async (volumeBackupId: string) => {
 	const volumeBackup = await findVolumeBackupById(volumeBackupId);
 	const serverId =
@@ -40,6 +70,10 @@ export const runVolumeBackup = async (volumeBackupId: string) => {
 			await execAsync(commandWithLog);
 		}
 
+		if (volumeBackup.keepLatestCount && volumeBackup.keepLatestCount > 0) {
+			await cleanupOldVolumeBackups(volumeBackup, serverId);
+		}
+
 		await updateDeploymentStatus(deployment.deploymentId, "done");
 	} catch (error) {
 		await updateDeploymentStatus(deployment.deploymentId, "error");