Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(dokploy): add flag to prevent run commands when is cloud

Browse Source
This commit is contained in:
Mauricio Siu
2024-10-23 00:54:40 -06:00
parent 548df8c0f4
commit 017bdd2778
13 changed files with 278 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
apps/dokploy/components/dashboard/settings/cluster/registry/add-self-docker-registry.tsx
View File

@@ -1,181 +0,0 @@
import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
DialogTrigger,
} from "@/components/ui/dialog";
import {
Form,
FormControl,
FormDescription,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { api } from "@/utils/api";
import { zodResolver } from "@hookform/resolvers/zod";
import { AlertTriangle, Container } from "lucide-react";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
const AddRegistrySchema = z.object({
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",
}),
registryUrl: z.string().min(1, {
message: "Registry URL is required",
}),
});
type AddRegistry = z.infer<typeof AddRegistrySchema>;
export const AddSelfHostedRegistry = () => {
const utils = api.useUtils();
const [isOpen, setIsOpen] = useState(false);
const { mutateAsync, error, isError, isLoading } =
api.registry.enableSelfHostedRegistry.useMutation();
const router = useRouter();
const form = useForm<AddRegistry>({
defaultValues: {
username: "",
password: "",
registryUrl: "",
},
resolver: zodResolver(AddRegistrySchema),
});
useEffect(() => {
form.reset({
registryUrl: "",
username: "",
password: "",
});
}, [form, form.reset, form.formState.isSubmitSuccessful]);
const onSubmit = async (data: AddRegistry) => {
await mutateAsync({
registryUrl: data.registryUrl,
username: data.username,
password: data.password,
})
.then(async (data) => {
await utils.registry.all.invalidate();
toast.success("Self Hosted Registry Created");
setIsOpen(false);
})
.catch(() => {
toast.error("Error to create a self hosted registry");
});
};
return (
<Dialog open={isOpen} onOpenChange={setIsOpen}>
<DialogTrigger asChild>
<Button className="max-sm:w-full">
<Container className="h-4 w-4" />
Enable Self Hosted Registry
</Button>
</DialogTrigger>
<DialogContent className="sm:m:max-w-lg ">
<DialogHeader>
<DialogTitle>Add a self hosted registry</DialogTitle>
<DialogDescription>
Fill the next fields to add a self hosted registry.
</DialogDescription>
</DialogHeader>
{isError && (
<div className="flex flex-row gap-4 rounded-lg bg-red-50 p-2 dark:bg-red-950">
<AlertTriangle className="text-red-600 dark:text-red-400" />
<span className="text-sm text-red-600 dark:text-red-400">
{error?.message}
</span>
</div>
)}
<Form {...form}>
<form
onSubmit={form.handleSubmit(onSubmit)}
className="grid w-full gap-4"
>
<div className="flex flex-col gap-4">
<FormField
control={form.control}
name="username"
render={({ field }) => (
<FormItem>
<FormLabel>Username</FormLabel>
<FormControl>
<Input placeholder="Username" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</div>
<div className="flex flex-col gap-4">
<FormField
control={form.control}
name="password"
render={({ field }) => (
<FormItem>
<FormLabel>Password</FormLabel>
<FormControl>
<Input
placeholder="Password"
{...field}
type="password"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</div>
<div className="flex flex-col gap-4">
<FormField
control={form.control}
name="registryUrl"
render={({ field }) => (
<FormItem>
<FormLabel>Registry URL</FormLabel>
<FormControl>
<Input placeholder="registry.dokploy.com" {...field} />
</FormControl>
<FormDescription>
Point a DNS record to the VPS IP address.
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
</div>
<DialogFooter>
<Button isLoading={isLoading} type="submit">
Create
</Button>
</DialogFooter>
</form>
</Form>
</DialogContent>
</Dialog>
);
};

4
apps/dokploy/components/dashboard/settings/cluster/registry/show-registry.tsx
View File

@@ -8,7 +8,6 @@ import {
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { Server } from "lucide-react"; import { Server } from "lucide-react";
import { AddRegistry } from "./add-docker-registry"; import { AddRegistry } from "./add-docker-registry";
import { AddSelfHostedRegistry } from "./add-self-docker-registry";
import { DeleteRegistry } from "./delete-registry"; import { DeleteRegistry } from "./delete-registry";
import { UpdateDockerRegistry } from "./update-docker-registry"; import { UpdateDockerRegistry } from "./update-docker-registry";
@@ -31,8 +30,6 @@ export const ShowRegistry = () => {
<div className="flex flex-row gap-2"> <div className="flex flex-row gap-2">
{data && data?.length > 0 && ( {data && data?.length > 0 && (
<> <>
{!haveSelfHostedRegistry && <AddSelfHostedRegistry />}
<AddRegistry /> <AddRegistry />
</> </>
)} )}
@@ -47,7 +44,6 @@ export const ShowRegistry = () => {
</span> </span>
<div className="flex flex-row md:flex-row gap-2 flex-wrap w-full justify-center"> <div className="flex flex-row md:flex-row gap-2 flex-wrap w-full justify-center">
<AddSelfHostedRegistry />
<AddRegistry /> <AddRegistry />
</div> </div>
</div> </div>

135
apps/dokploy/components/dashboard/settings/destination/add-destination.tsx
View File

@@ -18,6 +18,16 @@ import {
FormMessage, FormMessage,
} from "@/components/ui/form"; } from "@/components/ui/form";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectLabel,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { cn } from "@/lib/utils";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { useEffect } from "react"; import { useEffect } from "react";
@@ -32,12 +42,15 @@ const addDestination = z.object({
bucket: z.string(), bucket: z.string(),
region: z.string(), region: z.string(),
endpoint: z.string(), endpoint: z.string(),
serverId: z.string().optional(),
}); });
type AddDestination = z.infer<typeof addDestination>; type AddDestination = z.infer<typeof addDestination>;
export const AddDestination = () => { export const AddDestination = () => {
const utils = api.useUtils(); const utils = api.useUtils();
const { data: servers } = api.server.withSSHKey.useQuery();
const { data: isCloud } = api.settings.isCloud.useQuery();
const { mutateAsync, isError, error, isLoading } = const { mutateAsync, isError, error, isLoading } =
api.destination.create.useMutation(); api.destination.create.useMutation();
@@ -189,30 +202,106 @@ export const AddDestination = () => {
/> />
</form> </form>
<DialogFooter className="flex w-full flex-row !justify-between pt-3"> <DialogFooter
<Button className={cn(
isLoading={isLoadingConnection} isCloud ? "!flex-col" : "flex-row",
type="button" "flex w-full !justify-between pt-3 gap-4",
variant="secondary" )}
onClick={async () => { >
await testConnection({ {isCloud ? (
accessKey: form.getValues("accessKeyId"), <div className="flex flex-col gap-4 border p-2 rounded-lg">
bucket: form.getValues("bucket"), <span className="text-sm text-muted-foreground">
endpoint: form.getValues("endpoint"), Select a server to test the destination. If you don't have a
name: "Test", server choose the default one.
region: form.getValues("region"), </span>
secretAccessKey: form.getValues("secretAccessKey"), <FormField
}) control={form.control}
.then(async () => { name="serverId"
toast.success("Connection Success"); render={({ field }) => (
<FormItem>
<FormLabel>Server (Optional)</FormLabel>
<FormControl>
<Select
onValueChange={field.onChange}
defaultValue={field.value}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="Select a server" />
</SelectTrigger>
<SelectContent>
<SelectGroup>
<SelectLabel>Servers</SelectLabel>
{servers?.map((server) => (
<SelectItem
key={server.serverId}
value={server.serverId}
>
{server.name}
</SelectItem>
))}
<SelectItem value={"none"}>None</SelectItem>
</SelectGroup>
</SelectContent>
</Select>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<Button
type="button"
variant={"secondary"}
isLoading={isLoading}
onClick={async () => {
await testConnection({
accessKey: form.getValues("accessKeyId"),
bucket: form.getValues("bucket"),
endpoint: form.getValues("endpoint"),
name: "Test",
region: form.getValues("region"),
secretAccessKey: form.getValues("secretAccessKey"),
serverId: form.getValues("serverId"),
})
.then(async () => {
toast.success("Connection Success");
})
.catch((e) => {
toast.error("Error to connect the provider", {
description: e.message,
});
});
}}
>
Test Connection
</Button>
</div>
) : (
<Button
isLoading={isLoadingConnection}
type="button"
variant="secondary"
onClick={async () => {
await testConnection({
accessKey: form.getValues("accessKeyId"),
bucket: form.getValues("bucket"),
endpoint: form.getValues("endpoint"),
name: "Test",
region: form.getValues("region"),
secretAccessKey: form.getValues("secretAccessKey"),
}) })
.catch(() => { .then(async () => {
toast.error("Error to connect the provider"); toast.success("Connection Success");
}); })
}} .catch(() => {
> toast.error("Error to connect the provider");
Test connection });
</Button> }}
>
Test connection
</Button>
)}
<Button <Button
isLoading={isLoading} isLoading={isLoading}
form="hook-form-destination-add" form="hook-form-destination-add"

134
apps/dokploy/components/dashboard/settings/destination/update-destination.tsx
View File

@@ -18,6 +18,16 @@ import {
FormMessage, FormMessage,
} from "@/components/ui/form"; } from "@/components/ui/form";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectLabel,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { cn } from "@/lib/utils";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { PenBoxIcon } from "lucide-react"; import { PenBoxIcon } from "lucide-react";
@@ -33,6 +43,7 @@ const updateDestination = z.object({
bucket: z.string(), bucket: z.string(),
region: z.string(), region: z.string(),
endpoint: z.string(), endpoint: z.string(),
serverId: z.string().optional(),
}); });
type UpdateDestination = z.infer<typeof updateDestination>; type UpdateDestination = z.infer<typeof updateDestination>;
@@ -43,6 +54,8 @@ interface Props {
export const UpdateDestination = ({ destinationId }: Props) => { export const UpdateDestination = ({ destinationId }: Props) => {
const utils = api.useUtils(); const utils = api.useUtils();
const { data: servers } = api.server.withSSHKey.useQuery();
const { data: isCloud } = api.settings.isCloud.useQuery();
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const { data, refetch } = api.destination.one.useQuery( const { data, refetch } = api.destination.one.useQuery(
{ {
@@ -220,34 +233,107 @@ export const UpdateDestination = ({ destinationId }: Props) => {
</div> </div>
</form> </form>
<DialogFooter className="flex w-full flex-row !justify-between pt-3"> <DialogFooter
<Button className={cn(
isLoading={isLoadingConnection} isCloud ? "!flex-col" : "flex-row",
type="button" "flex w-full !justify-between pt-3 gap-4",
variant="secondary" )}
onClick={async () => { >
await testConnection({ {isCloud ? (
accessKey: form.getValues("accessKeyId"), <div className="flex flex-col gap-4 border p-2 rounded-lg">
bucket: form.getValues("bucket"), <span className="text-sm text-muted-foreground">
endpoint: form.getValues("endpoint"), Select a server to test the destination. If you don't have a
name: "Test", server choose the default one.
region: form.getValues("region"), </span>
secretAccessKey: form.getValues("secretAccessKey"), <FormField
}) control={form.control}
.then(async () => { name="serverId"
toast.success("Connection Success"); render={({ field }) => (
<FormItem>
<FormLabel>Server (Optional)</FormLabel>
<FormControl>
<Select
onValueChange={field.onChange}
defaultValue={field.value}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="Select a server" />
</SelectTrigger>
<SelectContent>
<SelectGroup>
<SelectLabel>Servers</SelectLabel>
{servers?.map((server) => (
<SelectItem
key={server.serverId}
value={server.serverId}
>
{server.name}
</SelectItem>
))}
<SelectItem value={"none"}>None</SelectItem>
</SelectGroup>
</SelectContent>
</Select>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<Button
type="button"
variant={"secondary"}
onClick={async () => {
await testConnection({
accessKey: form.getValues("accessKeyId"),
bucket: form.getValues("bucket"),
endpoint: form.getValues("endpoint"),
name: "Test",
region: form.getValues("region"),
secretAccessKey: form.getValues("secretAccessKey"),
serverId: form.getValues("serverId"),
})
.then(async () => {
toast.success("Connection Success");
})
.catch(() => {
toast.error("Error to connect the provider");
});
}}
>
Test Connection
</Button>
</div>
) : (
<Button
isLoading={isLoadingConnection}
type="button"
variant="secondary"
onClick={async () => {
await testConnection({
accessKey: form.getValues("accessKeyId"),
bucket: form.getValues("bucket"),
endpoint: form.getValues("endpoint"),
name: "Test",
region: form.getValues("region"),
secretAccessKey: form.getValues("secretAccessKey"),
}) })
.catch(() => { .then(async () => {
toast.error("Error to connect the provider"); toast.success("Connection Success");
}); })
}} .catch(() => {
> toast.error("Error to connect the provider");
Test connection });
</Button> }}
>
Test connection
</Button>
)}
<Button <Button
isLoading={form.formState.isSubmitting}
form="hook-form" form="hook-form"
type="submit" type="submit"
isLoading={form.formState.isSubmitting}
> >
Update Update
</Button> </Button>

22
apps/dokploy/server/api/routers/destination.ts
View File

@@ -12,9 +12,10 @@ import {
destinations, destinations,
} from "@/server/db/schema"; } from "@/server/db/schema";
import { import {
IS_CLOUD,
createDestintation, createDestintation,
execAsync, execAsync,
findAdmin, execAsyncRemote,
findDestinationById, findDestinationById,
removeDestinationById, removeDestinationById,
updateDestinationById, updateDestinationById,
@@ -53,11 +54,26 @@ export const destinationRouter = createTRPCRouter({
]; ];
const rcloneDestination = `:s3:${bucket}`; const rcloneDestination = `:s3:${bucket}`;
const rcloneCommand = `rclone ls ${rcloneFlags.join(" ")} "${rcloneDestination}"`; const rcloneCommand = `rclone ls ${rcloneFlags.join(" ")} "${rcloneDestination}"`;
await execAsync(rcloneCommand);
if (IS_CLOUD && !input.serverId) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Server not found",
});
}
if (IS_CLOUD) {
await execAsyncRemote(input.serverId || "", rcloneCommand);
} else {
await execAsync(rcloneCommand);
}
} catch (error) { } catch (error) {
throw new TRPCError({ throw new TRPCError({
code: "BAD_REQUEST", code: "BAD_REQUEST",
message: "Error to connect to bucket", message:
error instanceof Error
? error?.message
: "Error to connect to bucket",
cause: error, cause: error,
}); });
} }

40
apps/dokploy/server/api/routers/registry.ts
View File

@@ -1,6 +1,5 @@
import { import {
apiCreateRegistry, apiCreateRegistry,
apiEnableSelfHostedRegistry,
apiFindOneRegistry, apiFindOneRegistry,
apiRemoveRegistry, apiRemoveRegistry,
apiTestRegistry, apiTestRegistry,
@@ -13,8 +12,6 @@ import {
execAsyncRemote, execAsyncRemote,
findAllRegistryByAdminId, findAllRegistryByAdminId,
findRegistryById, findRegistryById,
initializeRegistry,
manageRegistry,
removeRegistry, removeRegistry,
updateRegistry, updateRegistry,
} from "@dokploy/server"; } from "@dokploy/server";
@@ -84,6 +81,13 @@ export const registryRouter = createTRPCRouter({
try { try {
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 (IS_CLOUD && !input.serverId) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Select a server to test the registry",
});
}
if (input.serverId && input.serverId !== "none") { if (input.serverId && input.serverId !== "none") {
await execAsyncRemote(input.serverId, loginCommand); await execAsyncRemote(input.serverId, loginCommand);
} else { } else {
@@ -96,34 +100,4 @@ export const registryRouter = createTRPCRouter({
return false; return false;
} }
}), }),
enableSelfHostedRegistry: adminProcedure
.input(apiEnableSelfHostedRegistry)
.mutation(async ({ input, ctx }) => {
if (IS_CLOUD) {
throw new TRPCError({
code: "UNAUTHORIZED",
message: "Self Hosted Registry is not available in the cloud version",
});
}
const selfHostedRegistry = await createRegistry(
{
...input,
registryName: "Self Hosted Registry",
registryType: "selfHosted",
registryUrl:
process.env.NODE_ENV === "production"
? input.registryUrl
: "dokploy-registry.docker.localhost",
imagePrefix: null,
serverId: undefined,
},
ctx.user.adminId,
);
await manageRegistry(selfHostedRegistry);
await initializeRegistry(input.username, input.password);
return selfHostedRegistry;
}),
}); });

2
apps/dokploy/server/api/routers/settings.ts
View File

@@ -510,7 +510,7 @@ export const settingsRouter = createTRPCRouter({
if (input?.serverId) { if (input?.serverId) {
const result = await execAsyncRemote(input.serverId, command); const result = await execAsyncRemote(input.serverId, command);
stdout = result.stdout; stdout = result.stdout;
} else { } else if (!IS_CLOUD) {
const result = await execAsync( const result = await execAsync(
"docker service inspect --format='{{json .Endpoint.Ports}}' dokploy-traefik", "docker service inspect --format='{{json .Endpoint.Ports}}' dokploy-traefik",
); );

10
packages/server/src/db/schema/destination.ts
View File

@@ -53,7 +53,10 @@ export const apiCreateDestination = createSchema
endpoint: true, endpoint: true,
secretAccessKey: true, secretAccessKey: true,
}) })
.required(); .required()
.extend({
serverId: z.string().optional(),
});
export const apiFindOneDestination = createSchema export const apiFindOneDestination = createSchema
.pick({ .pick({
@@ -77,4 +80,7 @@ export const apiUpdateDestination = createSchema
secretAccessKey: true, secretAccessKey: true,
destinationId: true, destinationId: true,
}) })
.required(); .required()
.extend({
serverId: z.string().optional(),
});

2
packages/server/src/index.ts
View File

@@ -37,7 +37,6 @@ export * from "./services/application";
export * from "./setup/config-paths"; export * from "./setup/config-paths";
export * from "./setup/postgres-setup"; export * from "./setup/postgres-setup";
export * from "./setup/redis-setup"; export * from "./setup/redis-setup";
export * from "./setup/registry-setup";
export * from "./setup/server-setup"; export * from "./setup/server-setup";
export * from "./setup/setup"; export * from "./setup/setup";
export * from "./setup/traefik-setup"; export * from "./setup/traefik-setup";
@@ -97,7 +96,6 @@ export * from "./utils/traefik/domain";
export * from "./utils/traefik/file-types"; export * from "./utils/traefik/file-types";
export * from "./utils/traefik/middleware"; export * from "./utils/traefik/middleware";
export * from "./utils/traefik/redirect"; export * from "./utils/traefik/redirect";
export * from "./utils/traefik/registry";
export * from "./utils/traefik/security"; export * from "./utils/traefik/security";
export * from "./utils/traefik/types"; export * from "./utils/traefik/types";
export * from "./utils/traefik/web-server"; export * from "./utils/traefik/web-server";

36
packages/server/src/services/registry.ts
View File

@@ -1,14 +1,9 @@
import { db } from "@/server/db"; import { db } from "@/server/db";
import { type apiCreateRegistry, registry } from "@/server/db/schema"; import { type apiCreateRegistry, registry } from "@/server/db/schema";
import { initializeRegistry } from "@/server/setup/registry-setup";
import { removeService } from "@/server/utils/docker/utils";
import { execAsync, execAsyncRemote } from "@/server/utils/process/execAsync"; import { execAsync, execAsyncRemote } from "@/server/utils/process/execAsync";
import {
manageRegistry,
removeSelfHostedRegistry,
} from "@/server/utils/traefik/registry";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { IS_CLOUD } from "../constants";
export type Registry = typeof registry.$inferSelect; export type Registry = typeof registry.$inferSelect;
@@ -32,6 +27,13 @@ export const createRegistry = async (
message: "Error input: Inserting registry", message: "Error input: Inserting registry",
}); });
} }
if (IS_CLOUD && !input.serverId && input.serverId !== "none") {
throw new TRPCError({
code: "NOT_FOUND",
message: "Select a server to add the registry",
});
}
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") { if (input.serverId && input.serverId !== "none") {
await execAsyncRemote(input.serverId, loginCommand); await execAsyncRemote(input.serverId, loginCommand);
@@ -58,13 +60,10 @@ export const removeRegistry = async (registryId: string) => {
}); });
} }
if (response.registryType === "selfHosted") { if (!IS_CLOUD) {
await removeSelfHostedRegistry(); await execAsync(`docker logout ${response.registryUrl}`);
await removeService("dokploy-registry");
} }
await execAsync(`docker logout ${response.registryUrl}`);
return response; return response;
} catch (error) { } catch (error) {
throw new TRPCError({ throw new TRPCError({
@@ -89,12 +88,19 @@ export const updateRegistry = async (
.returning() .returning()
.then((res) => res[0]); .then((res) => res[0]);
if (response?.registryType === "selfHosted") {
await manageRegistry(response);
await initializeRegistry(response.username, response.password);
}
const loginCommand = `echo ${response?.password} | docker login ${response?.registryUrl} --username ${response?.username} --password-stdin`; const loginCommand = `echo ${response?.password} | docker login ${response?.registryUrl} --username ${response?.username} --password-stdin`;
if (
IS_CLOUD &&
!registryData?.serverId &&
registryData?.serverId !== "none"
) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Select a server to add the registry",
});
}
if (registryData?.serverId && registryData?.serverId !== "none") { if (registryData?.serverId && registryData?.serverId !== "none") {
await execAsyncRemote(registryData.serverId, loginCommand); await execAsyncRemote(registryData.serverId, loginCommand);
} else if (response?.registryType === "cloud") { } else if (response?.registryType === "cloud") {

91
packages/server/src/setup/registry-setup.ts
View File

@@ -1,91 +0,0 @@
import type { CreateServiceOptions } from "dockerode";
import { docker, paths } from "../constants";
import { generatePassword } from "../templates/utils";
import { pullImage } from "../utils/docker/utils";
import { execAsync } from "../utils/process/execAsync";
export const initializeRegistry = async (
username: string,
password: string,
) => {
const { REGISTRY_PATH } = paths();
const imageName = "registry:2.8.3";
const containerName = "dokploy-registry";
await generateRegistryPassword(username, password);
const randomPass = generatePassword();
const settings: CreateServiceOptions = {
Name: containerName,
TaskTemplate: {
ContainerSpec: {
Image: imageName,
Env: [
"REGISTRY_STORAGE_DELETE_ENABLED=true",
"REGISTRY_AUTH=htpasswd",
"REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
"REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd",
`REGISTRY_HTTP_SECRET=${randomPass}`,
],
Mounts: [
{
Type: "bind",
Source: `${REGISTRY_PATH}/htpasswd`,
Target: "/auth/htpasswd",
ReadOnly: true,
},
{
Type: "volume",
Source: "registry-data",
Target: "/var/lib/registry",
ReadOnly: false,
},
],
},
Networks: [{ Target: "dokploy-network" }],
Placement: {
Constraints: ["node.role==manager"],
},
},
Mode: {
Replicated: {
Replicas: 1,
},
},
EndpointSpec: {
Ports: [
{
TargetPort: 5000,
PublishedPort: 5000,
Protocol: "tcp",
PublishMode: "host",
},
],
},
};
try {
await pullImage(imageName);
const service = docker.getService(containerName);
const inspect = await service.inspect();
await service.update({
version: Number.parseInt(inspect.Version.Index),
...settings,
});
console.log("Registry Started ✅");
} catch (error) {
await docker.createService(settings);
console.log("Registry Not Found: Starting ✅");
}
};
const generateRegistryPassword = async (username: string, password: string) => {
try {
const { REGISTRY_PATH } = paths();
const command = `htpasswd -nbB ${username} "${password}" > ${REGISTRY_PATH}/htpasswd`;
const result = await execAsync(command);
console.log("Password generated ✅");
return result.stdout.trim();
} catch (error) {
console.error("Error generating password:", error);
return null;
}
};

2
packages/server/src/utils/providers/git.ts
View File

@@ -55,8 +55,6 @@ export const cloneGitRepository = async (
await addHostToKnownHosts(customGitUrl); await addHostToKnownHosts(customGitUrl);
} }
await recreateDirectory(outputPath); await recreateDirectory(outputPath);
// const command = `GIT_SSH_COMMAND="ssh -i ${keyPath} -o UserKnownHostsFile=${knownHostsPath}" git clone --branch ${customGitBranch} --depth 1 ${customGitUrl} ${gitCopyPath} --progress`;
// const { stdout, stderr } = await execAsync(command);
writeStream.write( writeStream.write(
`\nCloning Repo Custom ${customGitUrl} to ${outputPath}: ✅\n`, `\nCloning Repo Custom ${customGitUrl} to ${outputPath}: ✅\n`,
); );

75
packages/server/src/utils/traefik/registry.ts
View File

@@ -1,75 +0,0 @@
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
import { join } from "node:path";
import { paths } from "@/server/constants";
import type { Registry } from "@/server/services/registry";
import { dump, load } from "js-yaml";
import { removeDirectoryIfExistsContent } from "../filesystem/directory";
import type { FileConfig, HttpRouter } from "./file-types";
export const manageRegistry = async (registry: Registry) => {
const { REGISTRY_PATH } = paths();
if (!existsSync(REGISTRY_PATH)) {
mkdirSync(REGISTRY_PATH, { recursive: true });
}
const appName = "dokploy-registry";
const config: FileConfig = loadOrCreateConfig();
const serviceName = `${appName}-service`;
const routerName = `${appName}-router`;
config.http = config.http || { routers: {}, services: {} };
config.http.routers = config.http.routers || {};
config.http.services = config.http.services || {};
config.http.routers[routerName] = await createRegistryRouterConfig(registry);
config.http.services[serviceName] = {
loadBalancer: {
servers: [{ url: `http://${appName}:5000` }],
passHostHeader: true,
},
};
const yamlConfig = dump(config);
const configFile = join(REGISTRY_PATH, "registry.yml");
writeFileSync(configFile, yamlConfig);
};
export const removeSelfHostedRegistry = async () => {
const { REGISTRY_PATH } = paths();
await removeDirectoryIfExistsContent(REGISTRY_PATH);
};
const createRegistryRouterConfig = async (registry: Registry) => {
const { registryUrl } = registry;
const routerConfig: HttpRouter = {
rule: `Host(\`${registryUrl}\`)`,
service: "dokploy-registry-service",
middlewares: ["redirect-to-https"],
entryPoints: [
"web",
...(process.env.NODE_ENV === "production" ? ["websecure"] : []),
],
...(process.env.NODE_ENV === "production"
? {
tls: { certResolver: "letsencrypt" },
}
: {}),
};
return routerConfig;
};
const loadOrCreateConfig = (): FileConfig => {
const { REGISTRY_PATH } = paths();
const configPath = join(REGISTRY_PATH, "registry.yml");
if (existsSync(configPath)) {
const yamlStr = readFileSync(configPath, "utf8");
const parsedConfig = (load(yamlStr) as FileConfig) || {
http: { routers: {}, services: {} },
};
return parsedConfig;
}
return { http: { routers: {}, services: {} } };
};