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: reuse safeDockerLoginCommand from registry.ts instead of duplicating shEscape

Browse Source
This commit is contained in:
lear
2026-03-04 12:45:57 +03:00
parent 7185047eb7
commit d2fabc998d
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/services/registry.ts
+1 -1
View File
@@ -16,7 +16,7 @@ function shEscape(s: string | undefined): string {
return `'${s.replace(/'/g, `'\\''`)}'`; return `'${s.replace(/'/g, `'\\''`)}'`;
} }
function safeDockerLoginCommand( export function safeDockerLoginCommand(
registry: string | undefined, registry: string | undefined,
user: string | undefined, user: string | undefined,
pass: string | undefined, pass: string | undefined,
packages/server/src/services/rollbacks.ts
+6 -10
View File
@@ -23,7 +23,7 @@ import { findDeploymentById } from "./deployment";
import type { Mount } from "./mount"; import type { Mount } from "./mount";
import type { Port } from "./port"; import type { Port } from "./port";
import type { Project } from "./project"; import type { Project } from "./project";
import type { Registry } from "./registry"; import { type Registry, safeDockerLoginCommand } from "./registry";
export const createRollback = async ( export const createRollback = async (
input: z.infer<typeof createRollbackSchema>, input: z.infer<typeof createRollbackSchema>,
@@ -175,10 +175,11 @@ const dockerLoginForRegistry = async (
registry: Registry, registry: Registry,
serverId?: string | null, serverId?: string | null,
) => { ) => {
const escapedRegistry = shEscape(registry.registryUrl); const loginCommand = safeDockerLoginCommand(
const escapedUser = shEscape(registry.username); registry.registryUrl,
const escapedPassword = shEscape(registry.password); registry.username,
const loginCommand = `printf %s ${escapedPassword} | docker login ${escapedRegistry} -u ${escapedUser} --password-stdin`; registry.password,
);
if (serverId) { if (serverId) {
await execAsyncRemote(serverId, loginCommand); await execAsyncRemote(serverId, loginCommand);
@@ -187,11 +188,6 @@ const dockerLoginForRegistry = async (
} }
}; };
function shEscape(s: string | undefined): string {
if (!s) return "''";
return `'${s.replace(/'/g, `'\\''`)}'`;
}
const rollbackApplication = async ( const rollbackApplication = async (
appName: string, appName: string,
image: string, image: string,