Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: use canary in development or canary tags

Browse Source
This commit is contained in:
Mauricio Siu
2025-02-02 19:41:07 -06:00
parent f638f49ab6
commit f9b4035c20
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/server/src/services/docker.ts
View File

@@ -58,7 +58,11 @@ export const getContainers = async (serverId?: string | null) => {
serverId, serverId,
}; };
}) })
.filter((container) => !container.name.includes("dokploy")); .filter(
(container) =>
!container.name.includes("dokploy") ||
container.name.includes("dokploy-monitoring"),
);
return containers; return containers;
} catch (error) { } catch (error) {

23
packages/server/src/setup/monitoring-setup.ts
View File

@@ -4,12 +4,20 @@ import { findAdminById } from "../services/admin";
import { pullImage, pullRemoteImage } from "../utils/docker/utils"; import { pullImage, pullRemoteImage } from "../utils/docker/utils";
import { execAsync, execAsyncRemote } from "../utils/process/execAsync"; import { execAsync, execAsyncRemote } from "../utils/process/execAsync";
import { getRemoteDocker } from "../utils/servers/remote-docker"; import { getRemoteDocker } from "../utils/servers/remote-docker";
import { getDokployImageTag } from "../services/settings";
export const setupMonitoring = async (serverId: string) => { export const setupMonitoring = async (serverId: string) => {
const server = await findServerById(serverId); const server = await findServerById(serverId);
const containerName = "mauricio-monitoring"; const containerName = "dokploy-monitoring";
const imageName = "dokploy/monitoring:canary"; let imageName = "dokploy/monitoring:latest";
if (
getDokployImageTag() !== "latest" ||
process.env.NODE_ENV === "development"
) {
imageName = "dokploy/monitoring:canary";
}
const settings: ContainerCreateOptions = { const settings: ContainerCreateOptions = {
name: containerName, name: containerName,
@@ -73,8 +81,15 @@ export const setupMonitoring = async (serverId: string) => {
export const setupWebMonitoring = async (adminId: string) => { export const setupWebMonitoring = async (adminId: string) => {
const admin = await findAdminById(adminId); const admin = await findAdminById(adminId);
const containerName = "mauricio-monitoring"; const containerName = "dokploy-monitoring";
const imageName = "dokploy/monitoring:canary"; let imageName = "dokploy/monitoring:latest";
if (
getDokployImageTag() !== "latest" ||
process.env.NODE_ENV === "development"
) {
imageName = "dokploy/monitoring:canary";
}
const settings: ContainerCreateOptions = { const settings: ContainerCreateOptions = {
name: containerName, name: containerName,