andwati/dokploy
1
0
Fork 0
mirror of https://github.com/andwati/dokploy.git synced 2026-11-12 06:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(upload): simplify file upload process to Docker container

Browse Source 
- Consolidated the file upload logic for both remote and local servers into a single command.
- Removed redundant temporary file handling and streamlined error management.
- Improved code readability by reducing complexity in the uploadFileToContainer function.
This commit is contained in:
Mauricio Siu
2026-04-03 17:29:24 -06:00
parent d2e4922c2f
commit cfa60aa971
1 changed files with 13 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/services/docker.ts
+13 -62
View File
@@ -1,6 +1,3 @@
import { mkdtemp, rm, writeFile } from "node:fs/promises";
import { join } from "node:path";
import { tmpdir } from "node:os";
import { import {
execAsync, execAsync,
execAsyncRemote, execAsyncRemote,
@@ -526,67 +523,21 @@ export const uploadFileToContainer = async (
? destinationPath ? destinationPath
: `/${destinationPath}`; : `/${destinationPath}`;
if (serverId) { const base64Content = fileBuffer.toString("base64");
// Remote server: transfer file via base64 encoding using heredoc const tempFileName = `dokploy-upload-${Date.now()}-${fileName.replace(/[^a-zA-Z0-9.-]/g, "_")}`;
const base64Content = fileBuffer.toString("base64"); const tempPath = `/tmp/${tempFileName}`;
const tempFileName = `dokploy-upload-${Date.now()}-${fileName.replace(/[^a-zA-Z0-9.-]/g, "_")}`;
const tempPath = `/tmp/${tempFileName}`;
try { const command = `echo '${base64Content}' | base64 -d > "${tempPath}" && docker cp "${tempPath}" "${containerId}:${normalizedPath}" ; rm -f "${tempPath}"`;
// Create temp directory and write file on remote server using heredoc
// This handles large files and special characters better than echo
const writeCommand = `cat << 'EOF' | base64 -d > "${tempPath}"
${base64Content}
EOF
`;
await execAsyncRemote(serverId, writeCommand); try {
if (serverId) {
// Copy file into container await execAsyncRemote(serverId, command);
const copyCommand = `docker cp "${tempPath}" "${containerId}:${normalizedPath}"`; } else {
await execAsyncRemote(serverId, copyCommand); await execAsync(command);
// Clean up temp file
const cleanupCommand = `rm -f "${tempPath}"`;
await execAsyncRemote(serverId, cleanupCommand);
} catch (error) {
// Try to clean up on error
try {
await execAsyncRemote(serverId, `rm -f "${tempPath}"`);
} catch {
// Ignore cleanup errors
}
throw new Error(
`Failed to upload file to container: ${error instanceof Error ? error.message : String(error)}`,
);
}
} else {
// Local server: use temp directory
const tempDir = await mkdtemp(join(tmpdir(), "dokploy-upload-"));
const tempFilePath = join(tempDir, fileName);
try {
// Write file to temp directory
await writeFile(tempFilePath, fileBuffer);
// Copy file into container
const copyCommand = `docker cp "${tempFilePath}" "${containerId}:${normalizedPath}"`;
await execAsync(copyCommand);
// Clean up temp directory
await rm(tempFilePath, { force: true });
await rm(tempDir, { recursive: true, force: true });
} catch (error) {
// Try to clean up on error
try {
await rm(tempFilePath, { force: true });
await rm(tempDir, { recursive: true, force: true });
} catch {
// Ignore cleanup errors
}
throw new Error(
`Failed to upload file to container: ${error instanceof Error ? error.message : String(error)}`,
);
} }
} catch (error) {
throw new Error(
`Failed to upload file to container: ${error instanceof Error ? error.message : String(error)}`,
);
} }
}; };