From f9b4035c203e2d288b315e6bc63b2b694bc34af5 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 2 Feb 2025 19:41:07 -0600
Subject: [PATCH] refactor: use canary in development or canary tags

---
 packages/server/src/services/docker.ts        |  6 ++++-
 packages/server/src/setup/monitoring-setup.ts | 23 +++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/services/docker.ts b/packages/server/src/services/docker.ts
index b7a5c440..597c03fa 100644
--- a/packages/server/src/services/docker.ts
+++ b/packages/server/src/services/docker.ts
@@ -58,7 +58,11 @@ export const getContainers = async (serverId?: string | null) => {
 					serverId,
 				};
 			})
-			.filter((container) => !container.name.includes("dokploy"));
+			.filter(
+				(container) =>
+					!container.name.includes("dokploy") ||
+					container.name.includes("dokploy-monitoring"),
+			);
 
 		return containers;
 	} catch (error) {
diff --git a/packages/server/src/setup/monitoring-setup.ts b/packages/server/src/setup/monitoring-setup.ts
index bf50cdb9..1a22142f 100644
--- a/packages/server/src/setup/monitoring-setup.ts
+++ b/packages/server/src/setup/monitoring-setup.ts
@@ -4,12 +4,20 @@ import { findAdminById } from "../services/admin";
 import { pullImage, pullRemoteImage } from "../utils/docker/utils";
 import { execAsync, execAsyncRemote } from "../utils/process/execAsync";
 import { getRemoteDocker } from "../utils/servers/remote-docker";
+import { getDokployImageTag } from "../services/settings";
 
 export const setupMonitoring = async (serverId: string) => {
 	const server = await findServerById(serverId);
 
-	const containerName = "mauricio-monitoring";
-	const imageName = "dokploy/monitoring:canary";
+	const containerName = "dokploy-monitoring";
+	let imageName = "dokploy/monitoring:latest";
+
+	if (
+		getDokployImageTag() !== "latest" ||
+		process.env.NODE_ENV === "development"
+	) {
+		imageName = "dokploy/monitoring:canary";
+	}
 
 	const settings: ContainerCreateOptions = {
 		name: containerName,
@@ -73,8 +81,15 @@ export const setupMonitoring = async (serverId: string) => {
 export const setupWebMonitoring = async (adminId: string) => {
 	const admin = await findAdminById(adminId);
 
-	const containerName = "mauricio-monitoring";
-	const imageName = "dokploy/monitoring:canary";
+	const containerName = "dokploy-monitoring";
+	let imageName = "dokploy/monitoring:latest";
+
+	if (
+		getDokployImageTag() !== "latest" ||
+		process.env.NODE_ENV === "development"
+	) {
+		imageName = "dokploy/monitoring:canary";
+	}
 
 	const settings: ContainerCreateOptions = {
 		name: containerName,