Merge pull request #520 from Dokploy/487-private-docker-container-pull-failed-despite-having-docker-registry-configured-in-registry

fix(registry): add option to login the registry in the remote server

apps/dokploy/server/api/routers/registry.ts

@@ -7,7 +7,7 @@ import {
 	apiUpdateRegistry,
 } from "@/server/db/schema";
 import { initializeRegistry } from "@/server/setup/registry-setup";
-import { execAsync } from "@/server/utils/process/execAsync";
+import { execAsync, execAsyncRemote } from "@/server/utils/process/execAsync";
 import { manageRegistry } from "@/server/utils/traefik/registry";
 import { TRPCError } from "@trpc/server";
 import {
@@ -58,7 +58,13 @@ export const registryRouter = createTRPCRouter({
 		.mutation(async ({ input }) => {
 			try {
 				const loginCommand = `echo ${input.password} | docker login ${input.registryUrl} --username ${input.username} --password-stdin`;
-				await execAsync(loginCommand);
+
+				if (input.serverId && input.serverId !== "none") {
+					await execAsyncRemote(input.serverId, loginCommand);
+				} else {
+					await execAsync(loginCommand);
+				}
+
 				return true;
 			} catch (error) {
 				console.log("Error Registry:", error);
@@ -78,6 +84,7 @@ export const registryRouter = createTRPCRouter({
 						? input.registryUrl
 						: "dokploy-registry.docker.localhost",
 				imagePrefix: null,
+				serverId: undefined,
 			});
 
 			await manageRegistry(selfHostedRegistry);
@@ -86,3 +93,17 @@ export const registryRouter = createTRPCRouter({
 			return selfHostedRegistry;
 		}),
 });
+
+const shellEscape = (str: string) => {
+	const ret = [];
+	let s = str;
+	if (/[^A-Za-z0-9_\/:=-]/.test(s)) {
+		s = `'${s.replace(/'/g, "'\\''")}'`;
+		s = s
+			.replace(/^(?:'')+/g, "") // unduplicate single-quote at the beginning
+			.replace(/\\'''/g, "\\'"); // remove non-escaped single-quote if there are enclosed between 2 escaped
+	}
+	ret.push(s);
+
+	return ret.join(" ");
+};

apps/dokploy/server/api/services/registry.ts

@@ -2,7 +2,7 @@ import { db } from "@/server/db";
 import { type apiCreateRegistry, registry } from "@/server/db/schema";
 import { initializeRegistry } from "@/server/setup/registry-setup";
 import { removeService } from "@/server/utils/docker/utils";
-import { execAsync } from "@/server/utils/process/execAsync";
+import { execAsync, execAsyncRemote } from "@/server/utils/process/execAsync";
 import {
 	manageRegistry,
 	removeSelfHostedRegistry,
@@ -32,9 +32,10 @@ export const createRegistry = async (input: typeof apiCreateRegistry._type) => {
 				message: "Error input:  Inserting registry",
 			});
 		}
-
-		if (newRegistry.registryType === "cloud") {
-			const loginCommand = `echo ${input.password} | docker login ${input.registryUrl} --username ${input.username} --password-stdin`;
+		const loginCommand = `echo ${input.password} | docker login ${input.registryUrl} --username ${input.username} --password-stdin`;
+		if (input.serverId && input.serverId !== "none") {
+			await execAsyncRemote(input.serverId, loginCommand);
+		} else if (newRegistry.registryType === "cloud") {
 			await execAsync(loginCommand);
 		}
 
@@ -76,7 +77,7 @@ export const removeRegistry = async (registryId: string) => {
 
 export const updateRegistry = async (
 	registryId: string,
-	registryData: Partial<Registry>,
+	registryData: Partial<Registry> & { serverId?: string | null },
 ) => {
 	try {
 		const response = await db
@@ -92,6 +93,13 @@ export const updateRegistry = async (
 			await manageRegistry(response);
 			await initializeRegistry(response.username, response.password);
 		}
+		const loginCommand = `echo ${response?.password} | docker login ${response?.registryUrl} --username ${response?.username} --password-stdin`;
+
+		if (registryData?.serverId && registryData?.serverId !== "none") {
+			await execAsyncRemote(registryData.serverId, loginCommand);
+		} else if (response?.registryType === "cloud") {
+			await execAsync(loginCommand);
+		}
 
 		return response;
 	} catch (error) {

apps/dokploy/server/db/schema/registry.ts

@@ -23,7 +23,7 @@ export const registry = pgTable("registry", {
 	imagePrefix: text("imagePrefix"),
 	username: text("username").notNull(),
 	password: text("password").notNull(),
-	registryUrl: text("registryUrl").notNull(),
+	registryUrl: text("registryUrl").notNull().default(""),
 	createdAt: text("createdAt")
 		.notNull()
 		.$defaultFn(() => new Date().toISOString()),
@@ -45,7 +45,7 @@ const createSchema = createInsertSchema(registry, {
 	registryName: z.string().min(1),
 	username: z.string().min(1),
 	password: z.string().min(1),
-	registryUrl: z.string().min(1),
+	registryUrl: z.string(),
 	adminId: z.string().min(1),
 	registryId: z.string().min(1),
 	registryType: z.enum(["selfHosted", "cloud"]),
@@ -62,7 +62,10 @@ export const apiCreateRegistry = createSchema
 		registryType: z.enum(["selfHosted", "cloud"]),
 		imagePrefix: z.string().nullable().optional(),
 	})
-	.required();
+	.required()
+	.extend({
+		serverId: z.string().optional(),
+	});
 
 export const apiTestRegistry = createSchema.pick({}).extend({
 	registryName: z.string().min(1),
@@ -71,6 +74,7 @@ export const apiTestRegistry = createSchema.pick({}).extend({
 	registryUrl: z.string(),
 	registryType: z.enum(["selfHosted", "cloud"]),
 	imagePrefix: z.string().nullable().optional(),
+	serverId: z.string().optional(),
 });
 
 export const apiRemoveRegistry = createSchema
@@ -87,6 +91,7 @@ export const apiFindOneRegistry = createSchema
 
 export const apiUpdateRegistry = createSchema.partial().extend({
 	registryId: z.string().min(1),
+	serverId: z.string().optional(),
 });
 
 export const apiEnableSelfHostedRegistry = createSchema