diff --git a/components/dashboard/settings/cluster/registry/add-self-docker-registry.tsx b/components/dashboard/settings/cluster/registry/add-self-docker-registry.tsx index 78a8d5008..52e8c1e7d 100644 --- a/components/dashboard/settings/cluster/registry/add-self-docker-registry.tsx +++ b/components/dashboard/settings/cluster/registry/add-self-docker-registry.tsx @@ -28,9 +28,14 @@ import { toast } from "sonner"; import { z } from "zod"; const AddRegistrySchema = z.object({ - username: z.string().min(1, { - message: "Username is required", - }), + username: z + .string() + .min(1, { + message: "Username is required", + }) + .regex(/^[a-zA-Z0-9]+$/, { + message: "Username can only contain letters and numbers", + }), password: z.string().min(1, { message: "Password is required", }), @@ -49,18 +54,18 @@ export const AddSelfHostedRegistry = () => { const router = useRouter(); const form = useForm({ defaultValues: { - username: "siumauricio", - password: "Password123", - registryUrl: "https://registry.dokploy.com", + username: "", + password: "", + registryUrl: "", }, resolver: zodResolver(AddRegistrySchema), }); useEffect(() => { form.reset({ - registryUrl: "https://registry.dokploy.com", - username: "siumauricio", - password: "Password123", + registryUrl: "", + username: "", + password: "", }); }, [form, form.reset, form.formState.isSubmitSuccessful]); diff --git a/server/utils/cluster/upload.ts b/server/utils/cluster/upload.ts index 234fdbd54..2b0c6b2b5 100644 --- a/server/utils/cluster/upload.ts +++ b/server/utils/cluster/upload.ts @@ -24,7 +24,7 @@ export const uploadImage = async ( : registryUrl; const registryTag = imagePrefix - ? `${registryUrl}/${imagePrefix}/${imageName}` + ? `${finalURL}/${imagePrefix}/${imageName}` : `${finalURL}/${imageName}`; try { @@ -59,3 +59,7 @@ export const uploadImage = async ( throw error; } }; +// docker: +// endpoint: "unix:///var/run/docker.sock" +// exposedByDefault: false +// swarmMode: true diff --git a/server/utils/traefik/registry.ts b/server/utils/traefik/registry.ts index 6f2960ea2..a08af834f 100644 --- a/server/utils/traefik/registry.ts +++ b/server/utils/traefik/registry.ts @@ -44,11 +44,6 @@ const createRegistryRouterConfig = async (registry: Registry) => { const routerConfig: HttpRouter = { rule: `Host(\`${registryUrl}\`)`, service: "dokploy-registry-service", - ...(process.env.NODE_ENV === "production" - ? { - middlewares: ["redirect-to-https"], - } - : {}), entryPoints: [ "web", ...(process.env.NODE_ENV === "production" ? ["websecure"] : []),