Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-06-16 04:35:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[autofix.ci] apply automated fixes

Browse Source
This commit is contained in:
autofix-ci[bot]
2026-02-09 00:06:56 +00:00
committed by GitHub
parent c8fd999044
commit bb02de690b
4 changed files with 71 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/dokploy/components/dashboard/swarm/containers/container-row.tsx
View File

@@ -1,13 +1,6 @@
import {
AlertCircle,
HardDrive,
Network,
} from "lucide-react";
import { AlertCircle, HardDrive, Network } from "lucide-react";
import { Badge } from "@/components/ui/badge";
import {
TableCell,
TableRow,
} from "@/components/ui/table";
import { TableCell, TableRow } from "@/components/ui/table";
import {
Tooltip,
TooltipContent,
@@ -27,7 +20,9 @@ export const ContainerRow = ({ container, stat }: ContainerRowProps) => {
const hasError = container.Error && container.Error.trim() !== "";
const stateBadge = (
<Badge variant={hasError ? "destructive" : isRunning ? "default" : "destructive"}>
<Badge
variant={hasError ? "destructive" : isRunning ? "default" : "destructive"}
>
{container.CurrentState}
</Badge>
);
@@ -36,9 +31,7 @@ export const ContainerRow = ({ container, stat }: ContainerRowProps) => {
<TableRow>
<TableCell>
<div className="flex flex-col gap-1">
<span className="font-medium text-sm">
{container.Name}
</span>
<span className="font-medium text-sm">{container.Name}</span>
<span className="text-xs text-muted-foreground truncate max-w-[230px]">
{container.Image}
</span>
@@ -66,9 +59,7 @@ export const ContainerRow = ({ container, stat }: ContainerRowProps) => {
</TableCell>
<TableCell className="text-right">
{stat ? (
<span className="text-sm font-medium">
{formatCpu(stat.CPUPerc)}
</span>
<span className="text-sm font-medium">{formatCpu(stat.CPUPerc)}</span>
) : (
<span className="text-xs text-muted-foreground">--</span>
)}

40
apps/dokploy/components/dashboard/swarm/containers/node-section.tsx
View File

@@ -1,8 +1,4 @@
import {
ChevronDown,
ChevronRight,
Server,
} from "lucide-react";
import { ChevronDown, ChevronRight, Server } from "lucide-react";
import { Badge } from "@/components/ui/badge";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import {
@@ -63,9 +59,7 @@ export const NodeSection = ({
<span className="absolute -top-1 -right-1 h-2.5 w-2.5 rounded-full bg-destructive" />
)}
</div>
<CardTitle className="text-base">
{group.nodeName}
</CardTitle>
<CardTitle className="text-base">{group.nodeName}</CardTitle>
{group.nodeStatus && (
<Badge
variant={
@@ -86,14 +80,14 @@ export const NodeSection = ({
</Badge>
{nodeDown ? (
<Badge variant="destructive">
{group.nodeStatus?.Status} / {group.nodeStatus?.Availability}
{group.nodeStatus?.Status} /{" "}
{group.nodeStatus?.Availability}
</Badge>
) : runningCount === group.containers.length ? (
<Badge variant="default">All Running</Badge>
) : (
<Badge variant="orange">
{runningCount}/{group.containers.length}{" "}
Running
{runningCount}/{group.containers.length} Running
</Badge>
)}
</div>
@@ -105,29 +99,17 @@ export const NodeSection = ({
<Table>
<TableHeader>
<TableRow>
<TableHead className="w-[250px]">
Container
</TableHead>
<TableHead className="w-[250px]">Container</TableHead>
<TableHead>State</TableHead>
<TableHead className="text-right">
CPU
</TableHead>
<TableHead className="text-right">
Memory
</TableHead>
<TableHead className="text-right">
Block I/O
</TableHead>
<TableHead className="text-right">
Network I/O
</TableHead>
<TableHead className="text-right">CPU</TableHead>
<TableHead className="text-right">Memory</TableHead>
<TableHead className="text-right">Block I/O</TableHead>
<TableHead className="text-right">Network I/O</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{group.containers.map((container) => {
const stat = findStatsForContainer(
container.Name,
);
const stat = findStatsForContainer(container.Name);
return (
<ContainerRow
key={container.ID}

121
apps/dokploy/components/dashboard/swarm/containers/show-swarm-containers.tsx
View File

@@ -81,9 +81,8 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
if (nodeApps && appDetails) {
for (const app of nodeApps) {
const details =
appDetails?.filter(
(detail: { Name: string }) =>
detail.Name.startsWith(`${app.Name}.`),
appDetails?.filter((detail: { Name: string }) =>
detail.Name.startsWith(`${app.Name}.`),
) || [];
if (details.length === 0) {
@@ -236,22 +235,24 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
<AlertTitle>No Swarm Services Found</AlertTitle>
<AlertDescription>
Docker Swarm is active with{" "}
<strong>{nodes?.length ?? 0} node(s)</strong>, but there
are no application services running in the swarm.
<strong>{nodes?.length ?? 0} node(s)</strong>, but there are no
application services running in the swarm.
</AlertDescription>
</Alert>
<div className="space-y-3 text-sm text-muted-foreground">
<p>
This view shows containers deployed as{" "}
<strong>Swarm services</strong>. Standalone or
Docker Compose containers won&apos;t appear here.
<strong>Swarm services</strong>. Standalone or Docker Compose
containers won&apos;t appear here.
</p>
<p>
To see containers in this view, make sure your applications are:
</p>
<p>To see containers in this view, make sure your applications are:</p>
<ol className="list-decimal list-inside space-y-2 ml-1">
<li>
<strong>Deployed as Swarm services</strong> &mdash;
Applications in Dokploy deploy to Swarm by default.
Docker Compose projects need to use{" "}
<strong>Deployed as Swarm services</strong> &mdash; Applications
in Dokploy deploy to Swarm by default. Docker Compose projects
need to use{" "}
<code className="bg-muted px-1.5 py-0.5 rounded text-xs">
Stack
</code>{" "}
@@ -262,9 +263,9 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
) to run as Swarm services.
</li>
<li>
<strong>Using a registry</strong> (for multi-node
setups) &mdash; Worker nodes need to pull images
from a shared registry. Configure one in{" "}
<strong>Using a registry</strong> (for multi-node setups) &mdash;
Worker nodes need to pull images from a shared registry. Configure
one in{" "}
<Link
href="/dashboard/settings/cluster"
className="text-primary underline underline-offset-4"
@@ -274,9 +275,8 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
.
</li>
<li>
<strong>Successfully built and deployed</strong>{" "}
&mdash; Check your project&apos;s deployment logs for
errors.
<strong>Successfully built and deployed</strong> &mdash; Check
your project&apos;s deployment logs for errors.
</li>
</ol>
<DocLinks />
@@ -303,8 +303,8 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
<AlertTriangle className="h-4 w-4" />
<AlertTitle>No Running Containers</AlertTitle>
<AlertDescription>
Found <strong>{nodeApps.length} service(s)</strong> in
the swarm, but none have running containers.
Found <strong>{nodeApps.length} service(s)</strong> in the swarm,
but none have running containers.
</AlertDescription>
</Alert>
{hasErrors && (
@@ -328,16 +328,13 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
<div className="space-y-3 text-sm text-muted-foreground">
<p>This can happen when:</p>
<ul className="list-disc list-inside space-y-2 ml-1">
<li>Services are scaled to 0 replicas</li>
<li>
Services are scaled to 0 replicas
Containers are failing to start &mdash; check deployment logs for
errors
</li>
<li>
Containers are failing to start &mdash; check
deployment logs for errors
</li>
<li>
Images can&apos;t be pulled on worker nodes &mdash;
verify your{" "}
Images can&apos;t be pulled on worker nodes &mdash; verify your{" "}
<Link
href="/dashboard/settings/cluster"
className="text-primary underline underline-offset-4"
@@ -346,8 +343,8 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
</Link>
</li>
<li>
Node constraints prevent scheduling &mdash; check
placement rules in your app&apos;s Cluster settings
Node constraints prevent scheduling &mdash; check placement rules
in your app&apos;s Cluster settings
</li>
</ul>
<DocLinks />
@@ -432,8 +429,7 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
Container Breakdown by Node
</CardTitle>
<p className="text-sm text-muted-foreground">
Showing containers across{" "}
{nodes?.length ?? 0} swarm node(s)
Showing containers across {nodes?.length ?? 0} swarm node(s)
{statsLoading ? "" : " (metrics refresh every 5s)"}
</p>
</div>
@@ -446,17 +442,13 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
<div className="grid gap-4 md:grid-cols-3">
<Card className="bg-background">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">
Swarm Nodes
</CardTitle>
<CardTitle className="text-sm font-medium">Swarm Nodes</CardTitle>
<div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md">
<Server className="h-4 w-4 text-muted-foreground dark:text-emerald-600" />
</div>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">
{nodes?.length ?? 0}
</div>
<div className="text-2xl font-bold">{nodes?.length ?? 0}</div>
{downNodes.length > 0 && (
<p className="text-xs text-destructive mt-1">
{downNodes.length} node(s) down or drained
@@ -467,17 +459,13 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
<Card className="bg-background">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">
Services
</CardTitle>
<CardTitle className="text-sm font-medium">Services</CardTitle>
<div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md">
<Cpu className="h-4 w-4 text-muted-foreground dark:text-emerald-600" />
</div>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">
{nodeApps?.length ?? 0}
</div>
<div className="text-2xl font-bold">{nodeApps?.length ?? 0}</div>
{unscheduledServices.length > 0 && (
<p className="text-xs text-muted-foreground mt-1">
{unscheduledServices.length} with no running tasks
@@ -496,9 +484,7 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
</div>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">
{runningContainers.length}
</div>
<div className="text-2xl font-bold">{runningContainers.length}</div>
</CardContent>
</Card>
</div>
@@ -507,19 +493,17 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
{downNodes.length > 0 && (
<Alert variant="destructive">
<AlertTriangle className="h-4 w-4" />
<AlertTitle>
{downNodes.length} Node(s) Unavailable
</AlertTitle>
<AlertTitle>{downNodes.length} Node(s) Unavailable</AlertTitle>
<AlertDescription>
<p className="mb-2">
The following nodes are not ready or have been drained.
Containers scheduled on these nodes may not be running.
The following nodes are not ready or have been drained. Containers
scheduled on these nodes may not be running.
</p>
<ul className="list-disc list-inside space-y-1 text-xs">
{downNodes.map((node: SwarmNode) => (
<li key={node.ID}>
<strong>{node.Hostname}</strong> &mdash;{" "}
Status: {node.Status}, Availability: {node.Availability}
<strong>{node.Hostname}</strong> &mdash; Status: {node.Status}
, Availability: {node.Availability}
{node.ManagerStatus && ` (${node.ManagerStatus})`}
</li>
))}
@@ -543,9 +527,12 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
<Info className="h-4 w-4" />
<AlertTitle>Multi-Node Metrics Note</AlertTitle>
<AlertDescription>
CPU, memory, and I/O metrics are collected from the manager
node via <code className="bg-muted px-1 py-0.5 rounded text-xs">docker stats</code>.
Containers running on worker nodes will show &ldquo;--&rdquo; for metrics.
CPU, memory, and I/O metrics are collected from the manager node via{" "}
<code className="bg-muted px-1 py-0.5 rounded text-xs">
docker stats
</code>
. Containers running on worker nodes will show &ldquo;--&rdquo; for
metrics.
</AlertDescription>
</Alert>
)}
@@ -571,8 +558,8 @@ export const ShowSwarmContainers = ({ serverId }: Props) => {
</AlertTitle>
<AlertDescription>
<p className="mb-2">
These services exist in the swarm but have no running
containers. They may be scaled to 0 replicas or failing to start.
These services exist in the swarm but have no running containers.
They may be scaled to 0 replicas or failing to start.
</p>
<ul className="list-disc list-inside space-y-1 text-xs">
{unscheduledServices.map((svc) => (
@@ -634,7 +621,10 @@ interface SwarmNotAvailableProps {
onRetry: () => void;
}
const SwarmNotAvailable = ({ errorMessage, onRetry }: SwarmNotAvailableProps) => (
const SwarmNotAvailable = ({
errorMessage,
onRetry,
}: SwarmNotAvailableProps) => (
<div className="flex flex-col gap-4 py-6 max-w-2xl mx-auto">
<Alert variant="destructive">
<AlertTriangle className="h-4 w-4" />
@@ -642,16 +632,14 @@ const SwarmNotAvailable = ({ errorMessage, onRetry }: SwarmNotAvailableProps) =>
<AlertDescription>
Could not reach Docker Swarm.{" "}
{errorMessage && (
<span className="block mt-1 text-xs opacity-80">
{errorMessage}
</span>
<span className="block mt-1 text-xs opacity-80">{errorMessage}</span>
)}
</AlertDescription>
</Alert>
<div className="space-y-3 text-sm text-muted-foreground">
<p>
This feature requires Docker Swarm to be initialized and active.
To get started:
This feature requires Docker Swarm to be initialized and active. To get
started:
</p>
<ol className="list-decimal list-inside space-y-2 ml-1">
<li>
@@ -679,12 +667,7 @@ const SwarmNotAvailable = ({ errorMessage, onRetry }: SwarmNotAvailableProps) =>
</ol>
<DocLinks />
</div>
<Button
variant="outline"
size="sm"
className="w-fit"
onClick={onRetry}
>
<Button variant="outline" size="sm" className="w-fit" onClick={onRetry}>
<RefreshCw className="h-4 w-4 mr-2" />
Retry
</Button>

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

@@ -498,7 +498,7 @@ export const getAllContainerStats = async (serverId?: string) => {
try {
let stdout = "";
const command =
"docker stats --no-stream --format '{\"BlockIO\":\"{{.BlockIO}}\",\"CPUPerc\":\"{{.CPUPerc}}\",\"Container\":\"{{.Container}}\",\"ID\":\"{{.ID}}\",\"MemPerc\":\"{{.MemPerc}}\",\"MemUsage\":\"{{.MemUsage}}\",\"Name\":\"{{.Name}}\",\"NetIO\":\"{{.NetIO}}\"}'";
'docker stats --no-stream --format \'{"BlockIO":"{{.BlockIO}}","CPUPerc":"{{.CPUPerc}}","Container":"{{.Container}}","ID":"{{.ID}}","MemPerc":"{{.MemPerc}}","MemUsage":"{{.MemUsage}}","Name":"{{.Name}}","NetIO":"{{.NetIO}}"}\'';
if (serverId) {
const result = await execAsyncRemote(serverId, command);