mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-21 19:38:47 +00:00
Merge pull request #5066 from Souvik-Cyclic/fix/docker-terminal-clipboard-5065
fix: add clipboard addon to docker container terminal
This commit is contained in:
@@ -3,9 +3,9 @@ import type { Domain } from "@dokploy/server/services/domain";
|
|||||||
import { addDomainToCompose } from "@dokploy/server/utils/docker/domain";
|
import { addDomainToCompose } from "@dokploy/server/utils/docker/domain";
|
||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
// addDomainToCompose reads the compose file from disk through loadDockerCompose
|
// With sourceType "raw", addDomainToCompose parses compose.composeFile
|
||||||
// (existsSync + readFileSync). Mock node:fs so the function runs its real
|
// directly instead of reading from disk, so baseCompose exposes it as a
|
||||||
// label-generation logic against an in-memory compose spec.
|
// getter that always reflects the current composeYaml for each test case.
|
||||||
const baseComposeYaml = `
|
const baseComposeYaml = `
|
||||||
services:
|
services:
|
||||||
frigate:
|
frigate:
|
||||||
@@ -13,15 +13,6 @@ services:
|
|||||||
`;
|
`;
|
||||||
let composeYaml = baseComposeYaml;
|
let composeYaml = baseComposeYaml;
|
||||||
|
|
||||||
vi.mock("node:fs", async (importOriginal) => {
|
|
||||||
const actual = await importOriginal<typeof import("node:fs")>();
|
|
||||||
return {
|
|
||||||
...actual,
|
|
||||||
existsSync: vi.fn(() => true),
|
|
||||||
readFileSync: vi.fn(() => composeYaml),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
const baseCompose = {
|
const baseCompose = {
|
||||||
appName: "test-app",
|
appName: "test-app",
|
||||||
composeType: "docker-compose",
|
composeType: "docker-compose",
|
||||||
@@ -31,6 +22,9 @@ const baseCompose = {
|
|||||||
isolatedDeployment: false,
|
isolatedDeployment: false,
|
||||||
randomize: false,
|
randomize: false,
|
||||||
suffix: "",
|
suffix: "",
|
||||||
|
get composeFile() {
|
||||||
|
return composeYaml;
|
||||||
|
},
|
||||||
} as unknown as Compose;
|
} as unknown as Compose;
|
||||||
|
|
||||||
const baseDomain: Domain = {
|
const baseDomain: Domain = {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import React, { useEffect, useRef } from "react";
|
|||||||
import { FitAddon } from "xterm-addon-fit";
|
import { FitAddon } from "xterm-addon-fit";
|
||||||
import "@xterm/xterm/css/xterm.css";
|
import "@xterm/xterm/css/xterm.css";
|
||||||
import { AttachAddon } from "@xterm/addon-attach";
|
import { AttachAddon } from "@xterm/addon-attach";
|
||||||
|
import { ClipboardAddon } from "@xterm/addon-clipboard";
|
||||||
import { useTheme } from "next-themes";
|
import { useTheme } from "next-themes";
|
||||||
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
|
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
|
||||||
import { fixMacOsAltKeys } from "@/lib/terminal-keyboard";
|
import { fixMacOsAltKeys } from "@/lib/terminal-keyboard";
|
||||||
@@ -46,6 +47,8 @@ export const DockerTerminal: React.FC<Props> = ({
|
|||||||
const ws = new WebSocket(wsUrl);
|
const ws = new WebSocket(wsUrl);
|
||||||
|
|
||||||
const addonAttach = new AttachAddon(ws);
|
const addonAttach = new AttachAddon(ws);
|
||||||
|
const clipboardAddon = new ClipboardAddon();
|
||||||
|
term.loadAddon(clipboardAddon);
|
||||||
fixMacOsAltKeys(term);
|
fixMacOsAltKeys(term);
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
term.open(termRef.current);
|
term.open(termRef.current);
|
||||||
@@ -55,6 +58,7 @@ export const DockerTerminal: React.FC<Props> = ({
|
|||||||
addonFit.fit();
|
addonFit.fit();
|
||||||
return () => {
|
return () => {
|
||||||
ws.readyState === WebSocket.OPEN && ws.close();
|
ws.readyState === WebSocket.OPEN && ws.close();
|
||||||
|
term.dispose();
|
||||||
};
|
};
|
||||||
}, [containerId, activeWay, id]);
|
}, [containerId, activeWay, id]);
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -70,9 +70,9 @@ export const ToggleDockerCleanup = ({ serverId }: Props) => {
|
|||||||
<TooltipContent side="top" className="max-w-sm">
|
<TooltipContent side="top" className="max-w-sm">
|
||||||
<p>
|
<p>
|
||||||
Runs a full Docker cleanup daily, pruning stopped containers,
|
Runs a full Docker cleanup daily, pruning stopped containers,
|
||||||
unused images, build cache, and system resources. This
|
unused images, build cache, and system resources. This may remove
|
||||||
may remove images built for Compose services that run on-demand
|
images built for Compose services that run on-demand (backup
|
||||||
(backup runners, cron jobs, one-off tasks).
|
runners, cron jobs, one-off tasks).
|
||||||
</p>
|
</p>
|
||||||
<p className="mt-1">
|
<p className="mt-1">
|
||||||
For custom cleanup strategies, use{" "}
|
For custom cleanup strategies, use{" "}
|
||||||
|
|||||||
Reference in New Issue
Block a user