From d1aaeb9a7b6f77379c243319444ef62200f85912 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 2 Feb 2025 19:43:28 -0600 Subject: [PATCH] refactor: adjust logic --- packages/server/src/setup/monitoring-setup.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/server/src/setup/monitoring-setup.ts b/packages/server/src/setup/monitoring-setup.ts index 1a22142f3..e7b39b0b3 100644 --- a/packages/server/src/setup/monitoring-setup.ts +++ b/packages/server/src/setup/monitoring-setup.ts @@ -1,10 +1,11 @@ import { findServerById } from "@dokploy/server/services/server"; import type { ContainerCreateOptions } from "dockerode"; import { findAdminById } from "../services/admin"; +import { getDokployImageTag } from "../services/settings"; 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"; +import { IS_CLOUD } from "../constants"; export const setupMonitoring = async (serverId: string) => { const server = await findServerById(serverId); @@ -13,8 +14,9 @@ export const setupMonitoring = async (serverId: string) => { let imageName = "dokploy/monitoring:latest"; if ( - getDokployImageTag() !== "latest" || - process.env.NODE_ENV === "development" + (getDokployImageTag() !== "latest" || + process.env.NODE_ENV === "development") && + !IS_CLOUD ) { imageName = "dokploy/monitoring:canary"; } @@ -85,8 +87,9 @@ export const setupWebMonitoring = async (adminId: string) => { let imageName = "dokploy/monitoring:latest"; if ( - getDokployImageTag() !== "latest" || - process.env.NODE_ENV === "development" + (getDokployImageTag() !== "latest" || + process.env.NODE_ENV === "development") && + !IS_CLOUD ) { imageName = "dokploy/monitoring:canary"; }