Merge branch 'canary' into patches-impl

This commit is contained in:
Mauricio Siu
2026-02-16 23:52:26 -06:00
83 changed files with 18938 additions and 3822 deletions
+21
View File
@@ -0,0 +1,21 @@
# Dockerfile for DevContainer
FROM node:20.16.0-bullseye-slim
# Install essential packages
RUN apt-get update && apt-get install -y \
curl \
bash \
git \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# Set up PNPM
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN corepack enable && corepack prepare [email protected] --activate
# Create workspace directory
WORKDIR /workspaces/dokploy
# Set up user permissions
USER node
+53
View File
@@ -0,0 +1,53 @@
{
"name": "Dokploy development container",
"build": {
"dockerfile": "Dockerfile",
"context": ".."
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"moby": true,
"version": "latest"
},
"ghcr.io/devcontainers/features/git:1": {
"ppa": true,
"version": "latest"
},
"ghcr.io/devcontainers/features/go:1": {
"version": "1.20"
}
},
"customizations": {
"vscode": {
"extensions": [
"ms-vscode.vscode-typescript-next",
"bradlc.vscode-tailwindcss",
"ms-vscode.vscode-json",
"biomejs.biome",
"golang.go",
"redhat.vscode-xml",
"github.vscode-github-actions",
"github.copilot",
"github.copilot-chat"
]
}
},
"forwardPorts": [3000, 5432, 6379],
"portsAttributes": {
"3000": {
"label": "Dokploy App",
"onAutoForward": "notify"
},
"5432": {
"label": "PostgreSQL",
"onAutoForward": "silent"
},
"6379": {
"label": "Redis",
"onAutoForward": "silent"
}
},
"remoteUser": "node",
"workspaceFolder": "/workspaces/dokploy",
"runArgs": ["--name", "dokploy-devcontainer"]
}
-3
View File
@@ -44,6 +44,3 @@ yarn-error.log*
.db .db
# Development environment
.devcontainer
+1 -1
View File
@@ -20,7 +20,7 @@
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"redis": "4.7.0", "redis": "4.7.0",
"zod": "^3.25.32" "zod": "^3.25.76"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^20.16.0", "@types/node": "^20.16.0",
@@ -83,6 +83,14 @@ describe("GitHub Webhook Skip CI", () => {
{ commits: [{ message: "[skip ci] test" }] }, { commits: [{ message: "[skip ci] test" }] },
), ),
).toBe("[skip ci] test"); ).toBe("[skip ci] test");
// Soft Serve
expect(
extractCommitMessage(
{ "x-softserve-event": "push" },
{ commits: [{ message: "[skip ci] test" }] },
),
).toBe("[skip ci] test");
}); });
it("should handle missing commit message", () => { it("should handle missing commit message", () => {
@@ -99,6 +107,9 @@ describe("GitHub Webhook Skip CI", () => {
expect(extractCommitMessage({ "x-gitea-event": "push" }, {})).toBe( expect(extractCommitMessage({ "x-gitea-event": "push" }, {})).toBe(
"NEW COMMIT", "NEW COMMIT",
); );
expect(extractCommitMessage({ "x-softserve-event": "push" }, {})).toBe(
"NEW COMMIT",
);
}); });
}); });
@@ -0,0 +1,49 @@
import { describe, expect, it } from "vitest";
import {
extractBranchName,
extractCommitMessage,
extractHash,
getProviderByHeader,
} from "@/pages/api/deploy/[refreshToken]";
describe("Soft Serve Webhook", () => {
const mockSoftServeHeaders = {
"x-softserve-event": "push",
};
const createMockBody = (message: string, hash: string, branch: string) => ({
event: "push",
ref: `refs/heads/${branch}`,
after: hash,
commits: [{ message: message }],
});
const message: string = "feat: add new feature";
const hash: string = "3c91c24ef9560bddc695bce138bf8a7094ec3df5";
const branch: string = "feat/add-new";
const goodWebhook = createMockBody(message, hash, branch);
it("should properly extract the provider name", () => {
expect(getProviderByHeader(mockSoftServeHeaders)).toBe("soft-serve");
});
it("should properly extract the commit message", () => {
expect(extractCommitMessage(mockSoftServeHeaders, goodWebhook)).toBe(
message,
);
});
it("should properly extract hash", () => {
expect(extractHash(mockSoftServeHeaders, goodWebhook)).toBe(hash);
});
it("should properly extract branch name", () => {
expect(extractBranchName(mockSoftServeHeaders, goodWebhook)).toBe(branch);
});
it("should gracefully handle invalid webhook", () => {
expect(getProviderByHeader({})).toBeNull();
expect(extractCommitMessage(mockSoftServeHeaders, {})).toBe("NEW COMMIT");
expect(extractHash(mockSoftServeHeaders, {})).toBe("NEW COMMIT");
expect(extractBranchName(mockSoftServeHeaders, {})).toBeNull();
});
});
@@ -275,3 +275,51 @@ test("CertificateType on websecure entrypoint", async () => {
expect(router.tls?.certResolver).toBe("letsencrypt"); expect(router.tls?.certResolver).toBe("letsencrypt");
}); });
/** IDN/Punycode */
test("Internationalized domain name is converted to punycode", async () => {
const router = await createRouterConfig(
baseApp,
{ ...baseDomain, host: "тест.рф" },
"web",
);
// тест.рф in punycode is xn--e1aybc.xn--p1ai
expect(router.rule).toContain("Host(`xn--e1aybc.xn--p1ai`)");
expect(router.rule).not.toContain("тест.рф");
});
test("ASCII domain remains unchanged", async () => {
const router = await createRouterConfig(
baseApp,
{ ...baseDomain, host: "example.com" },
"web",
);
expect(router.rule).toContain("Host(`example.com`)");
});
test("Russian Cyrillic label with .ru TLD is converted to punycode", async () => {
const router = await createRouterConfig(
baseApp,
{ ...baseDomain, host: "сайт.ru" },
"web",
);
// сайт in punycode is xn--80aswg
expect(router.rule).toContain("Host(`xn--80aswg.ru`)");
expect(router.rule).not.toContain("сайт");
});
test("Subdomain with Russian IDN TLD converts non-ASCII part to punycode", async () => {
const router = await createRouterConfig(
baseApp,
{ ...baseDomain, host: "app.тест.рф" },
"web",
);
// app stays ASCII, тест.рф becomes xn--e1aybc.xn--p1ai
expect(router.rule).toContain("Host(`app.xn--e1aybc.xn--p1ai`)");
expect(router.rule).not.toContain("тест.рф");
});
@@ -105,7 +105,14 @@ export const ModeForm = ({ id, type }: ModeFormProps) => {
const modeData = const modeData =
formData.type === "Replicated" formData.type === "Replicated"
? { Replicated: { Replicas: formData.Replicas } } ? {
Replicated: {
Replicas:
formData.Replicas !== undefined && formData.Replicas !== ""
? Number(formData.Replicas)
: undefined,
},
}
: { Global: {} }; : { Global: {} };
await mutateAsync({ await mutateAsync({
@@ -1,4 +1,4 @@
import { Paintbrush } from "lucide-react"; import { Ban } from "lucide-react";
import { toast } from "sonner"; import { toast } from "sonner";
import { import {
AlertDialog, AlertDialog,
@@ -35,7 +35,7 @@ export const CancelQueues = ({ id, type }: Props) => {
<AlertDialogTrigger asChild> <AlertDialogTrigger asChild>
<Button variant="destructive" className="w-fit" isLoading={isLoading}> <Button variant="destructive" className="w-fit" isLoading={isLoading}>
Cancel Queues Cancel Queues
<Paintbrush className="size-4" /> <Ban className="size-4" />
</Button> </Button>
</AlertDialogTrigger> </AlertDialogTrigger>
<AlertDialogContent> <AlertDialogContent>
@@ -0,0 +1,73 @@
import { Paintbrush } from "lucide-react";
import { toast } from "sonner";
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
AlertDialogTrigger,
} from "@/components/ui/alert-dialog";
import { Button } from "@/components/ui/button";
import { api } from "@/utils/api";
interface Props {
id: string;
type: "application" | "compose";
}
export const ClearDeployments = ({ id, type }: Props) => {
const utils = api.useUtils();
const { mutateAsync, isLoading } =
type === "application"
? api.application.clearDeployments.useMutation()
: api.compose.clearDeployments.useMutation();
return (
<AlertDialog>
<AlertDialogTrigger asChild>
<Button variant="outline" className="w-fit" isLoading={isLoading}>
Clear deployments
<Paintbrush className="size-4" />
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
Are you sure you want to clear old deployments?
</AlertDialogTitle>
<AlertDialogDescription>
This will delete all old deployment records and logs, keeping only
the active deployment (the most recent successful one).
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>Cancel</AlertDialogCancel>
<AlertDialogAction
onClick={async () => {
await mutateAsync({
applicationId: id || "",
composeId: id || "",
})
.then(async () => {
toast.success("Old deployments cleared successfully");
await utils.deployment.allByType.invalidate({
id,
type: type as "application" | "compose",
});
})
.catch((err) => {
toast.error(err.message);
});
}}
>
Confirm
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
);
};
@@ -6,6 +6,7 @@ import {
RefreshCcw, RefreshCcw,
RocketIcon, RocketIcon,
Settings, Settings,
Trash2,
} from "lucide-react"; } from "lucide-react";
import React, { useEffect, useMemo, useState } from "react"; import React, { useEffect, useMemo, useState } from "react";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -25,6 +26,7 @@ import {
import { api, type RouterOutputs } from "@/utils/api"; import { api, type RouterOutputs } from "@/utils/api";
import { ShowRollbackSettings } from "../rollbacks/show-rollback-settings"; import { ShowRollbackSettings } from "../rollbacks/show-rollback-settings";
import { CancelQueues } from "./cancel-queues"; import { CancelQueues } from "./cancel-queues";
import { ClearDeployments } from "./clear-deployments";
import { KillBuild } from "./kill-build"; import { KillBuild } from "./kill-build";
import { RefreshToken } from "./refresh-token"; import { RefreshToken } from "./refresh-token";
import { ShowDeployment } from "./show-deployment"; import { ShowDeployment } from "./show-deployment";
@@ -77,6 +79,8 @@ export const ShowDeployments = ({
api.rollback.rollback.useMutation(); api.rollback.rollback.useMutation();
const { mutateAsync: killProcess, isLoading: isKillingProcess } = const { mutateAsync: killProcess, isLoading: isKillingProcess } =
api.deployment.killProcess.useMutation(); api.deployment.killProcess.useMutation();
const { mutateAsync: removeDeployment, isLoading: isRemovingDeployment } =
api.deployment.removeDeployment.useMutation();
// Cancel deployment mutations // Cancel deployment mutations
const { const {
@@ -144,6 +148,9 @@ export const ShowDeployments = ({
</CardDescription> </CardDescription>
</div> </div>
<div className="flex flex-row items-center flex-wrap gap-2"> <div className="flex flex-row items-center flex-wrap gap-2">
{(type === "application" || type === "compose") && (
<ClearDeployments id={id} type={type} />
)}
{(type === "application" || type === "compose") && ( {(type === "application" || type === "compose") && (
<KillBuild id={id} type={type} /> <KillBuild id={id} type={type} />
)} )}
@@ -252,6 +259,8 @@ export const ShowDeployments = ({
const isExpanded = expandedDescriptions.has( const isExpanded = expandedDescriptions.has(
deployment.deploymentId, deployment.deploymentId,
); );
const canDelete =
deployment.status === "done" || deployment.status === "error";
return ( return (
<div <div
@@ -370,6 +379,33 @@ export const ShowDeployments = ({
View View
</Button> </Button>
{canDelete && (
<DialogAction
title="Delete Deployment"
description="Are you sure you want to delete this deployment? This action cannot be undone."
type="default"
onClick={async () => {
try {
await removeDeployment({
deploymentId: deployment.deploymentId,
});
toast.success("Deployment deleted successfully");
} catch (error) {
toast.error("Error deleting deployment");
}
}}
>
<Button
variant="destructive"
size="sm"
isLoading={isRemovingDeployment}
>
Delete
<Trash2 className="size-4" />
</Button>
</DialogAction>
)}
{deployment?.rollback && {deployment?.rollback &&
deployment.status === "done" && deployment.status === "done" &&
type === "application" && ( type === "application" && (
@@ -18,6 +18,7 @@ import {
PushoverIcon, PushoverIcon,
ResendIcon, ResendIcon,
SlackIcon, SlackIcon,
TeamsIcon,
TelegramIcon, TelegramIcon,
} from "@/components/icons/notification-icons"; } from "@/components/icons/notification-icons";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
@@ -164,6 +165,12 @@ export const notificationSchema = z.discriminatedUnion("type", [
webhookUrl: z.string().min(1, { message: "Webhook URL is required" }), webhookUrl: z.string().min(1, { message: "Webhook URL is required" }),
}) })
.merge(notificationBaseSchema), .merge(notificationBaseSchema),
z
.object({
type: z.literal("teams"),
webhookUrl: z.string().min(1, { message: "Webhook URL is required" }),
})
.merge(notificationBaseSchema),
]); ]);
export const notificationsMap = { export const notificationsMap = {
@@ -183,6 +190,10 @@ export const notificationsMap = {
icon: <LarkIcon className="text-muted-foreground" />, icon: <LarkIcon className="text-muted-foreground" />,
label: "Lark", label: "Lark",
}, },
teams: {
icon: <TeamsIcon className="text-muted-foreground" />,
label: "Microsoft Teams",
},
email: { email: {
icon: <Mail size={29} className="text-muted-foreground" />, icon: <Mail size={29} className="text-muted-foreground" />,
label: "Email", label: "Email",
@@ -244,6 +255,8 @@ export const HandleNotifications = ({ notificationId }: Props) => {
api.notification.testNtfyConnection.useMutation(); api.notification.testNtfyConnection.useMutation();
const { mutateAsync: testLarkConnection, isLoading: isLoadingLark } = const { mutateAsync: testLarkConnection, isLoading: isLoadingLark } =
api.notification.testLarkConnection.useMutation(); api.notification.testLarkConnection.useMutation();
const { mutateAsync: testTeamsConnection, isLoading: isLoadingTeams } =
api.notification.testTeamsConnection.useMutation();
const { mutateAsync: testCustomConnection, isLoading: isLoadingCustom } = const { mutateAsync: testCustomConnection, isLoading: isLoadingCustom } =
api.notification.testCustomConnection.useMutation(); api.notification.testCustomConnection.useMutation();
@@ -278,6 +291,9 @@ export const HandleNotifications = ({ notificationId }: Props) => {
const larkMutation = notificationId const larkMutation = notificationId
? api.notification.updateLark.useMutation() ? api.notification.updateLark.useMutation()
: api.notification.createLark.useMutation(); : api.notification.createLark.useMutation();
const teamsMutation = notificationId
? api.notification.updateTeams.useMutation()
: api.notification.createTeams.useMutation();
const pushoverMutation = notificationId const pushoverMutation = notificationId
? api.notification.updatePushover.useMutation() ? api.notification.updatePushover.useMutation()
: api.notification.createPushover.useMutation(); : api.notification.createPushover.useMutation();
@@ -353,7 +369,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
volumeBackup: notification.volumeBackup, volumeBackup: notification.volumeBackup,
type: notification.notificationType, type: notification.notificationType,
webhookUrl: notification.discord?.webhookUrl, webhookUrl: notification.discord?.webhookUrl,
decoration: notification.discord?.decoration || undefined, decoration: notification.discord?.decoration ?? undefined,
name: notification.name, name: notification.name,
dockerCleanup: notification.dockerCleanup, dockerCleanup: notification.dockerCleanup,
serverThreshold: notification.serverThreshold, serverThreshold: notification.serverThreshold,
@@ -400,7 +416,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
volumeBackup: notification.volumeBackup, volumeBackup: notification.volumeBackup,
type: notification.notificationType, type: notification.notificationType,
appToken: notification.gotify?.appToken, appToken: notification.gotify?.appToken,
decoration: notification.gotify?.decoration || undefined, decoration: notification.gotify?.decoration ?? undefined,
priority: notification.gotify?.priority, priority: notification.gotify?.priority,
serverUrl: notification.gotify?.serverUrl, serverUrl: notification.gotify?.serverUrl,
name: notification.name, name: notification.name,
@@ -435,6 +451,19 @@ export const HandleNotifications = ({ notificationId }: Props) => {
volumeBackup: notification.volumeBackup, volumeBackup: notification.volumeBackup,
serverThreshold: notification.serverThreshold, serverThreshold: notification.serverThreshold,
}); });
} else if (notification.notificationType === "teams") {
form.reset({
appBuildError: notification.appBuildError,
appDeploy: notification.appDeploy,
dokployRestart: notification.dokployRestart,
databaseBackup: notification.databaseBackup,
volumeBackup: notification.volumeBackup,
type: notification.notificationType,
webhookUrl: notification.teams?.webhookUrl,
name: notification.name,
dockerCleanup: notification.dockerCleanup,
serverThreshold: notification.serverThreshold,
});
} else if (notification.notificationType === "custom") { } else if (notification.notificationType === "custom") {
form.reset({ form.reset({
appBuildError: notification.appBuildError, appBuildError: notification.appBuildError,
@@ -488,6 +517,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
gotify: gotifyMutation, gotify: gotifyMutation,
ntfy: ntfyMutation, ntfy: ntfyMutation,
lark: larkMutation, lark: larkMutation,
teams: teamsMutation,
custom: customMutation, custom: customMutation,
pushover: pushoverMutation, pushover: pushoverMutation,
}; };
@@ -630,6 +660,20 @@ export const HandleNotifications = ({ notificationId }: Props) => {
larkId: notification?.larkId || "", larkId: notification?.larkId || "",
serverThreshold: serverThreshold, serverThreshold: serverThreshold,
}); });
} else if (data.type === "teams") {
promise = teamsMutation.mutateAsync({
appBuildError: appBuildError,
appDeploy: appDeploy,
dokployRestart: dokployRestart,
databaseBackup: databaseBackup,
volumeBackup: volumeBackup,
webhookUrl: data.webhookUrl,
name: data.name,
dockerCleanup: dockerCleanup,
notificationId: notificationId || "",
teamsId: notification?.teamsId || "",
serverThreshold: serverThreshold,
});
} else if (data.type === "custom") { } else if (data.type === "custom") {
// Convert headers array to object // Convert headers array to object
const headersRecord = const headersRecord =
@@ -1465,6 +1509,32 @@ export const HandleNotifications = ({ notificationId }: Props) => {
/> />
</> </>
)} )}
{type === "teams" && (
<>
<FormField
control={form.control}
name="webhookUrl"
render={({ field }) => (
<FormItem>
<FormLabel>Webhook URL</FormLabel>
<FormControl>
<Input
placeholder="https://xxx.webhook.office.com/webhookb2/..."
{...field}
/>
</FormControl>
<FormDescription>
Incoming Webhook URL from a Teams channel. Add an
Incoming Webhook in your channel settings to get the
URL.
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
</>
)}
{type === "pushover" && ( {type === "pushover" && (
<> <>
<FormField <FormField
@@ -1780,6 +1850,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
isLoadingGotify || isLoadingGotify ||
isLoadingNtfy || isLoadingNtfy ||
isLoadingLark || isLoadingLark ||
isLoadingTeams ||
isLoadingCustom || isLoadingCustom ||
isLoadingPushover isLoadingPushover
} }
@@ -1841,6 +1912,10 @@ export const HandleNotifications = ({ notificationId }: Props) => {
await testLarkConnection({ await testLarkConnection({
webhookUrl: data.webhookUrl, webhookUrl: data.webhookUrl,
}); });
} else if (data.type === "teams") {
await testTeamsConnection({
webhookUrl: data.webhookUrl,
});
} else if (data.type === "custom") { } else if (data.type === "custom") {
const headersRecord = const headersRecord =
data.headers && data.headers.length > 0 data.headers && data.headers.length > 0
@@ -7,6 +7,7 @@ import {
NtfyIcon, NtfyIcon,
ResendIcon, ResendIcon,
SlackIcon, SlackIcon,
TeamsIcon,
TelegramIcon, TelegramIcon,
} from "@/components/icons/notification-icons"; } from "@/components/icons/notification-icons";
import { DialogAction } from "@/components/shared/dialog-action"; import { DialogAction } from "@/components/shared/dialog-action";
@@ -37,7 +38,7 @@ export const ShowNotifications = () => {
</CardTitle> </CardTitle>
<CardDescription> <CardDescription>
Add your providers to receive notifications, like Discord, Slack, Add your providers to receive notifications, like Discord, Slack,
Telegram, Email, Resend, Lark. Telegram, Teams, Email, Resend, Lark.
</CardDescription> </CardDescription>
</CardHeader> </CardHeader>
<CardContent className="space-y-2 py-8 border-t"> <CardContent className="space-y-2 py-8 border-t">
@@ -112,6 +113,11 @@ export const ShowNotifications = () => {
<LarkIcon className="size-7 text-muted-foreground" /> <LarkIcon className="size-7 text-muted-foreground" />
</div> </div>
)} )}
{notification.notificationType === "teams" && (
<div className="flex items-center justify-center rounded-lg">
<TeamsIcon className="size-7 text-muted-foreground" />
</div>
)}
{notification.name} {notification.name}
</span> </span>
@@ -1,6 +1,5 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { Loader2, Palette, User } from "lucide-react"; import { Loader2, Palette, User } from "lucide-react";
import { useTranslation } from "next-i18next";
import { useEffect, useMemo, useRef, useState } from "react"; import { useEffect, useMemo, useRef, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -73,7 +72,6 @@ export const ProfileForm = () => {
isError, isError,
error, error,
} = api.user.update.useMutation(); } = api.user.update.useMutation();
const { t } = useTranslation("settings");
const [gravatarHash, setGravatarHash] = useState<string | null>(null); const [gravatarHash, setGravatarHash] = useState<string | null>(null);
const colorInputRef = useRef<HTMLInputElement>(null); const colorInputRef = useRef<HTMLInputElement>(null);
@@ -157,10 +155,10 @@ export const ProfileForm = () => {
<div> <div>
<CardTitle className="text-xl flex flex-row gap-2"> <CardTitle className="text-xl flex flex-row gap-2">
<User className="size-6 text-muted-foreground self-center" /> <User className="size-6 text-muted-foreground self-center" />
{t("settings.profile.title")} Account
</CardTitle> </CardTitle>
<CardDescription> <CardDescription>
{t("settings.profile.description")} Change the details of your profile here.
</CardDescription> </CardDescription>
</div> </div>
@@ -213,12 +211,9 @@ export const ProfileForm = () => {
name="email" name="email"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>{t("settings.profile.email")}</FormLabel> <FormLabel>Email</FormLabel>
<FormControl> <FormControl>
<Input <Input placeholder="Email" {...field} />
placeholder={t("settings.profile.email")}
{...field}
/>
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
@@ -233,7 +228,7 @@ export const ProfileForm = () => {
<FormControl> <FormControl>
<Input <Input
type="password" type="password"
placeholder={t("settings.profile.password")} placeholder="Current Password"
{...field} {...field}
value={field.value || ""} value={field.value || ""}
/> />
@@ -247,13 +242,11 @@ export const ProfileForm = () => {
name="password" name="password"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel> <FormLabel>Password</FormLabel>
{t("settings.profile.password")}
</FormLabel>
<FormControl> <FormControl>
<Input <Input
type="password" type="password"
placeholder={t("settings.profile.password")} placeholder="Password"
{...field} {...field}
value={field.value || ""} value={field.value || ""}
/> />
@@ -268,9 +261,7 @@ export const ProfileForm = () => {
name="image" name="image"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel> <FormLabel>Avatar</FormLabel>
{t("settings.profile.avatar")}
</FormLabel>
<FormControl> <FormControl>
<RadioGroup <RadioGroup
onValueChange={(e) => { onValueChange={(e) => {
@@ -454,7 +445,7 @@ export const ProfileForm = () => {
<div className="flex items-center justify-end gap-2"> <div className="flex items-center justify-end gap-2">
<Button type="submit" isLoading={isUpdating}> <Button type="submit" isLoading={isUpdating}>
{t("settings.common.save")} Save
</Button> </Button>
</div> </div>
</form> </form>
@@ -1,4 +1,3 @@
import { useTranslation } from "next-i18next";
import { toast } from "sonner"; import { toast } from "sonner";
import { UpdateServerIp } from "@/components/dashboard/settings/web-server/update-server-ip"; import { UpdateServerIp } from "@/components/dashboard/settings/web-server/update-server-ip";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
@@ -17,7 +16,6 @@ import { TerminalModal } from "../../web-server/terminal-modal";
import { GPUSupportModal } from "../gpu-support-modal"; import { GPUSupportModal } from "../gpu-support-modal";
export const ShowDokployActions = () => { export const ShowDokployActions = () => {
const { t } = useTranslation("settings");
const { mutateAsync: reloadServer, isLoading } = const { mutateAsync: reloadServer, isLoading } =
api.settings.reloadServer.useMutation(); api.settings.reloadServer.useMutation();
@@ -30,13 +28,11 @@ export const ShowDokployActions = () => {
<DropdownMenu> <DropdownMenu>
<DropdownMenuTrigger asChild disabled={isLoading}> <DropdownMenuTrigger asChild disabled={isLoading}>
<Button isLoading={isLoading} variant="outline"> <Button isLoading={isLoading} variant="outline">
{t("settings.server.webServer.server.label")} Server
</Button> </Button>
</DropdownMenuTrigger> </DropdownMenuTrigger>
<DropdownMenuContent className="w-56" align="start"> <DropdownMenuContent className="w-56" align="start">
<DropdownMenuLabel> <DropdownMenuLabel>Actions</DropdownMenuLabel>
{t("settings.server.webServer.actions")}
</DropdownMenuLabel>
<DropdownMenuSeparator /> <DropdownMenuSeparator />
<DropdownMenuGroup> <DropdownMenuGroup>
<DropdownMenuItem <DropdownMenuItem
@@ -51,17 +47,17 @@ export const ShowDokployActions = () => {
}} }}
className="cursor-pointer" className="cursor-pointer"
> >
<span>{t("settings.server.webServer.reload")}</span> <span>Reload</span>
</DropdownMenuItem> </DropdownMenuItem>
<TerminalModal serverId="local"> <TerminalModal serverId="local">
<span>{t("settings.common.enterTerminal")}</span> <span>Terminal</span>
</TerminalModal> </TerminalModal>
<ShowModalLogs appName="dokploy"> <ShowModalLogs appName="dokploy">
<DropdownMenuItem <DropdownMenuItem
className="cursor-pointer" className="cursor-pointer"
onSelect={(e) => e.preventDefault()} onSelect={(e) => e.preventDefault()}
> >
{t("settings.server.webServer.watchLogs")} View Logs
</DropdownMenuItem> </DropdownMenuItem>
</ShowModalLogs> </ShowModalLogs>
<GPUSupportModal /> <GPUSupportModal />
@@ -70,7 +66,7 @@ export const ShowDokployActions = () => {
className="cursor-pointer" className="cursor-pointer"
onSelect={(e) => e.preventDefault()} onSelect={(e) => e.preventDefault()}
> >
{t("settings.server.webServer.updateServerIp")} Update Server IP
</DropdownMenuItem> </DropdownMenuItem>
</UpdateServerIp> </UpdateServerIp>
@@ -1,4 +1,3 @@
import { useTranslation } from "next-i18next";
import { toast } from "sonner"; import { toast } from "sonner";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
@@ -16,7 +15,6 @@ interface Props {
serverId?: string; serverId?: string;
} }
export const ShowStorageActions = ({ serverId }: Props) => { export const ShowStorageActions = ({ serverId }: Props) => {
const { t } = useTranslation("settings");
const { mutateAsync: cleanAll, isLoading: cleanAllIsLoading } = const { mutateAsync: cleanAll, isLoading: cleanAllIsLoading } =
api.settings.cleanAll.useMutation(); api.settings.cleanAll.useMutation();
@@ -69,13 +67,11 @@ export const ShowStorageActions = ({ serverId }: Props) => {
} }
variant="outline" variant="outline"
> >
{t("settings.server.webServer.storage.label")} Space
</Button> </Button>
</DropdownMenuTrigger> </DropdownMenuTrigger>
<DropdownMenuContent className="w-64" align="start"> <DropdownMenuContent className="w-64" align="start">
<DropdownMenuLabel> <DropdownMenuLabel>Actions</DropdownMenuLabel>
{t("settings.server.webServer.actions")}
</DropdownMenuLabel>
<DropdownMenuSeparator /> <DropdownMenuSeparator />
<DropdownMenuGroup> <DropdownMenuGroup>
<DropdownMenuItem <DropdownMenuItem
@@ -92,9 +88,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
}); });
}} }}
> >
<span> <span>Clean unused images</span>
{t("settings.server.webServer.storage.cleanUnusedImages")}
</span>
</DropdownMenuItem> </DropdownMenuItem>
<DropdownMenuItem <DropdownMenuItem
className="w-full cursor-pointer" className="w-full cursor-pointer"
@@ -110,9 +104,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
}); });
}} }}
> >
<span> <span>Clean unused volumes</span>
{t("settings.server.webServer.storage.cleanUnusedVolumes")}
</span>
</DropdownMenuItem> </DropdownMenuItem>
<DropdownMenuItem <DropdownMenuItem
@@ -129,9 +121,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
}); });
}} }}
> >
<span> <span>Clean stopped containers</span>
{t("settings.server.webServer.storage.cleanStoppedContainers")}
</span>
</DropdownMenuItem> </DropdownMenuItem>
<DropdownMenuItem <DropdownMenuItem
@@ -165,9 +155,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
}); });
}} }}
> >
<span> <span>Clean Docker Builder & System</span>
{t("settings.server.webServer.storage.cleanDockerBuilder")}
</span>
</DropdownMenuItem> </DropdownMenuItem>
{!serverId && ( {!serverId && (
<DropdownMenuItem <DropdownMenuItem
@@ -182,9 +170,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
}); });
}} }}
> >
<span> <span>Clean Monitoring</span>
{t("settings.server.webServer.storage.cleanMonitoring")}
</span>
</DropdownMenuItem> </DropdownMenuItem>
)} )}
@@ -202,7 +188,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
}); });
}} }}
> >
<span>{t("settings.server.webServer.storage.cleanAll")}</span> <span>Clean all</span>
</DropdownMenuItem> </DropdownMenuItem>
</DropdownMenuGroup> </DropdownMenuGroup>
</DropdownMenuContent> </DropdownMenuContent>
@@ -1,4 +1,3 @@
import { useTranslation } from "next-i18next";
import { toast } from "sonner"; import { toast } from "sonner";
import { AlertBlock } from "@/components/shared/alert-block"; import { AlertBlock } from "@/components/shared/alert-block";
import { DialogAction } from "@/components/shared/dialog-action"; import { DialogAction } from "@/components/shared/dialog-action";
@@ -22,7 +21,6 @@ interface Props {
serverId?: string; serverId?: string;
} }
export const ShowTraefikActions = ({ serverId }: Props) => { export const ShowTraefikActions = ({ serverId }: Props) => {
const { t } = useTranslation("settings");
const { mutateAsync: reloadTraefik, isLoading: reloadTraefikIsLoading } = const { mutateAsync: reloadTraefik, isLoading: reloadTraefikIsLoading } =
api.settings.reloadTraefik.useMutation(); api.settings.reloadTraefik.useMutation();
@@ -75,13 +73,11 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
} }
variant="outline" variant="outline"
> >
{t("settings.server.webServer.traefik.label")} Traefik
</Button> </Button>
</DropdownMenuTrigger> </DropdownMenuTrigger>
<DropdownMenuContent className="w-56" align="start"> <DropdownMenuContent className="w-56" align="start">
<DropdownMenuLabel> <DropdownMenuLabel>Actions</DropdownMenuLabel>
{t("settings.server.webServer.actions")}
</DropdownMenuLabel>
<DropdownMenuSeparator /> <DropdownMenuSeparator />
<DropdownMenuGroup> <DropdownMenuGroup>
<DropdownMenuItem <DropdownMenuItem
@@ -100,7 +96,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
className="cursor-pointer" className="cursor-pointer"
disabled={isReloadHealthCheckExecuting} disabled={isReloadHealthCheckExecuting}
> >
<span>{t("settings.server.webServer.reload")}</span> <span>Reload</span>
</DropdownMenuItem> </DropdownMenuItem>
<ShowModalLogs <ShowModalLogs
appName="dokploy-traefik" appName="dokploy-traefik"
@@ -111,7 +107,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
onSelect={(e) => e.preventDefault()} onSelect={(e) => e.preventDefault()}
className="cursor-pointer" className="cursor-pointer"
> >
{t("settings.server.webServer.watchLogs")} View Logs
</DropdownMenuItem> </DropdownMenuItem>
</ShowModalLogs> </ShowModalLogs>
<EditTraefikEnv serverId={serverId}> <EditTraefikEnv serverId={serverId}>
@@ -119,7 +115,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
onSelect={(e) => e.preventDefault()} onSelect={(e) => e.preventDefault()}
className="cursor-pointer" className="cursor-pointer"
> >
<span>{t("settings.server.webServer.traefik.modifyEnv")}</span> <span>Modify Environment</span>
</DropdownMenuItem> </DropdownMenuItem>
</EditTraefikEnv> </EditTraefikEnv>
@@ -176,7 +172,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
onSelect={(e) => e.preventDefault()} onSelect={(e) => e.preventDefault()}
className="cursor-pointer" className="cursor-pointer"
> >
<span>{t("settings.server.webServer.traefik.managePorts")}</span> <span>Additional Port Mappings</span>
</DropdownMenuItem> </DropdownMenuItem>
</ManageTraefikPorts> </ManageTraefikPorts>
</DropdownMenuGroup> </DropdownMenuGroup>
@@ -1,7 +1,6 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { Pencil, PlusIcon } from "lucide-react"; import { Pencil, PlusIcon } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useTranslation } from "next-i18next";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -63,8 +62,6 @@ interface Props {
} }
export const HandleServers = ({ serverId, asButton = false }: Props) => { export const HandleServers = ({ serverId, asButton = false }: Props) => {
const { t } = useTranslation("settings");
const utils = api.useUtils(); const utils = api.useUtils();
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const { data: canCreateMoreServers, refetch } = const { data: canCreateMoreServers, refetch } =
@@ -365,7 +362,7 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
name="ipAddress" name="ipAddress"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>{t("settings.terminal.ipAddress")}</FormLabel> <FormLabel>IP Address</FormLabel>
<FormControl> <FormControl>
<Input placeholder="192.168.1.100" {...field} /> <Input placeholder="192.168.1.100" {...field} />
</FormControl> </FormControl>
@@ -379,7 +376,7 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
name="port" name="port"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>{t("settings.terminal.port")}</FormLabel> <FormLabel>Port</FormLabel>
<FormControl> <FormControl>
<Input <Input
placeholder="22" placeholder="22"
@@ -409,7 +406,7 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
name="username" name="username"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>{t("settings.terminal.username")}</FormLabel> <FormLabel>Username</FormLabel>
<FormControl> <FormControl>
<Input placeholder="root" {...field} /> <Input placeholder="root" {...field} />
</FormControl> </FormControl>
@@ -13,7 +13,6 @@ import {
} from "lucide-react"; } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { useTranslation } from "next-i18next";
import { toast } from "sonner"; import { toast } from "sonner";
import { AlertBlock } from "@/components/shared/alert-block"; import { AlertBlock } from "@/components/shared/alert-block";
import { DialogAction } from "@/components/shared/dialog-action"; import { DialogAction } from "@/components/shared/dialog-action";
@@ -52,7 +51,6 @@ import { ShowTraefikFileSystemModal } from "./show-traefik-file-system-modal";
import { WelcomeSuscription } from "./welcome-stripe/welcome-suscription"; import { WelcomeSuscription } from "./welcome-stripe/welcome-suscription";
export const ShowServers = () => { export const ShowServers = () => {
const { t } = useTranslation("settings");
const router = useRouter(); const router = useRouter();
const query = router.query; const query = router.query;
const { data, refetch, isLoading } = api.server.all.useQuery(); const { data, refetch, isLoading } = api.server.all.useQuery();
@@ -1,6 +1,5 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { GlobeIcon } from "lucide-react"; import { GlobeIcon } from "lucide-react";
import { useTranslation } from "next-i18next";
import { useEffect } from "react"; import { useEffect } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -66,7 +65,6 @@ const addServerDomain = z
type AddServerDomain = z.infer<typeof addServerDomain>; type AddServerDomain = z.infer<typeof addServerDomain>;
export const WebDomain = () => { export const WebDomain = () => {
const { t } = useTranslation("settings");
const { data, refetch } = api.settings.getWebServerSettings.useQuery(); const { data, refetch } = api.settings.getWebServerSettings.useQuery();
const { mutateAsync, isLoading } = const { mutateAsync, isLoading } =
api.settings.assignDomainServer.useMutation(); api.settings.assignDomainServer.useMutation();
@@ -119,10 +117,10 @@ export const WebDomain = () => {
<div className="flex flex-col gap-1"> <div className="flex flex-col gap-1">
<CardTitle className="text-xl flex flex-row gap-2"> <CardTitle className="text-xl flex flex-row gap-2">
<GlobeIcon className="size-6 text-muted-foreground self-center" /> <GlobeIcon className="size-6 text-muted-foreground self-center" />
{t("settings.server.domain.title")} Server Domain
</CardTitle> </CardTitle>
<CardDescription> <CardDescription>
{t("settings.server.domain.description")} Add a domain to your server application.
</CardDescription> </CardDescription>
</div> </div>
</CardHeader> </CardHeader>
@@ -151,9 +149,7 @@ export const WebDomain = () => {
render={({ field }) => { render={({ field }) => {
return ( return (
<FormItem> <FormItem>
<FormLabel> <FormLabel>Domain</FormLabel>
{t("settings.server.domain.form.domain")}
</FormLabel>
<FormControl> <FormControl>
<Input <Input
className="w-full" className="w-full"
@@ -173,9 +169,7 @@ export const WebDomain = () => {
render={({ field }) => { render={({ field }) => {
return ( return (
<FormItem> <FormItem>
<FormLabel> <FormLabel>Let's Encrypt Email</FormLabel>
{t("settings.server.domain.form.letsEncryptEmail")}
</FormLabel>
<FormControl> <FormControl>
<Input <Input
className="w-full" className="w-full"
@@ -216,32 +210,20 @@ export const WebDomain = () => {
render={({ field }) => { render={({ field }) => {
return ( return (
<FormItem className="md:col-span-2"> <FormItem className="md:col-span-2">
<FormLabel> <FormLabel>Certificate Provider</FormLabel>
{t("settings.server.domain.form.certificate.label")}
</FormLabel>
<Select <Select
onValueChange={field.onChange} onValueChange={field.onChange}
value={field.value} value={field.value}
> >
<FormControl> <FormControl>
<SelectTrigger> <SelectTrigger>
<SelectValue <SelectValue placeholder="Select a certificate" />
placeholder={t(
"settings.server.domain.form.certificate.placeholder",
)}
/>
</SelectTrigger> </SelectTrigger>
</FormControl> </FormControl>
<SelectContent> <SelectContent>
<SelectItem value={"none"}> <SelectItem value={"none"}>None</SelectItem>
{t(
"settings.server.domain.form.certificateOptions.none",
)}
</SelectItem>
<SelectItem value={"letsencrypt"}> <SelectItem value={"letsencrypt"}>
{t( Let's Encrypt
"settings.server.domain.form.certificateOptions.letsencrypt",
)}
</SelectItem> </SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
@@ -254,7 +236,7 @@ export const WebDomain = () => {
<div className="flex w-full justify-end col-span-2"> <div className="flex w-full justify-end col-span-2">
<Button isLoading={isLoading} type="submit"> <Button isLoading={isLoading} type="submit">
{t("settings.common.save")} Save
</Button> </Button>
</div> </div>
</form> </form>
@@ -1,5 +1,4 @@
import { ServerIcon } from "lucide-react"; import { ServerIcon } from "lucide-react";
import { useTranslation } from "next-i18next";
import { import {
Card, Card,
CardContent, CardContent,
@@ -15,7 +14,6 @@ import { ToggleDockerCleanup } from "./servers/actions/toggle-docker-cleanup";
import { UpdateServer } from "./web-server/update-server"; import { UpdateServer } from "./web-server/update-server";
export const WebServer = () => { export const WebServer = () => {
const { t } = useTranslation("settings");
const { data: webServerSettings } = const { data: webServerSettings } =
api.settings.getWebServerSettings.useQuery(); api.settings.getWebServerSettings.useQuery();
@@ -29,18 +27,16 @@ export const WebServer = () => {
<CardHeader className=""> <CardHeader className="">
<CardTitle className="text-xl flex flex-row gap-2"> <CardTitle className="text-xl flex flex-row gap-2">
<ServerIcon className="size-6 text-muted-foreground self-center" /> <ServerIcon className="size-6 text-muted-foreground self-center" />
{t("settings.server.webServer.title")} Web Server
</CardTitle> </CardTitle>
<CardDescription> <CardDescription>Reload or clean the web server.</CardDescription>
{t("settings.server.webServer.description")}
</CardDescription>
</CardHeader> </CardHeader>
{/* <CardHeader> {/* <CardHeader>
<CardTitle className="text-xl"> <CardTitle className="text-xl">
{t("settings.server.webServer.title")} Web Server
</CardTitle> </CardTitle>
<CardDescription> <CardDescription>
{t("settings.server.webServer.description")} Reload or clean the web server.
</CardDescription> </CardDescription>
</CardHeader> */} </CardHeader> */}
<CardContent className="space-y-6 py-6 border-t"> <CardContent className="space-y-6 py-6 border-t">
@@ -1,6 +1,5 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { Settings } from "lucide-react"; import { Settings } from "lucide-react";
import { useTranslation } from "next-i18next";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { z } from "zod"; import { z } from "zod";
import { import {
@@ -52,8 +51,6 @@ interface Props {
} }
const LocalServerConfig = ({ onSave }: Props) => { const LocalServerConfig = ({ onSave }: Props) => {
const { t } = useTranslation("settings");
const form = useForm<Schema>({ const form = useForm<Schema>({
defaultValues: getLocalServerData(), defaultValues: getLocalServerData(),
resolver: zodResolver(Schema), resolver: zodResolver(Schema),
@@ -77,9 +74,7 @@ const LocalServerConfig = ({ onSave }: Props) => {
<div className="flex flex-row items-center gap-2 justify-between w-full"> <div className="flex flex-row items-center gap-2 justify-between w-full">
<div className="flex flex-row gap-2 items-center"> <div className="flex flex-row gap-2 items-center">
<Settings className="h-4 w-4" /> <Settings className="h-4 w-4" />
<span className="dark:hover:text-white"> <span className="dark:hover:text-white">Connection settings</span>
{t("settings.terminal.connectionSettings")}
</span>
</div> </div>
</div> </div>
</AccordionTrigger> </AccordionTrigger>
@@ -96,7 +91,7 @@ const LocalServerConfig = ({ onSave }: Props) => {
name="port" name="port"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>{t("settings.terminal.port")}</FormLabel> <FormLabel>Port</FormLabel>
<FormControl> <FormControl>
<Input <Input
{...field} {...field}
@@ -124,7 +119,7 @@ const LocalServerConfig = ({ onSave }: Props) => {
name="username" name="username"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>{t("settings.terminal.username")}</FormLabel> <FormLabel>Username</FormLabel>
<FormControl> <FormControl>
<Input placeholder="root" {...field} /> <Input placeholder="root" {...field} />
</FormControl> </FormControl>
@@ -142,7 +137,7 @@ const LocalServerConfig = ({ onSave }: Props) => {
className="ml-auto" className="ml-auto"
disabled={!form.formState.isDirty} disabled={!form.formState.isDirty}
> >
{t("settings.common.save")} Save
</Button> </Button>
</AccordionContent> </AccordionContent>
</AccordionItem> </AccordionItem>
@@ -1,6 +1,5 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { ArrowRightLeft, Plus, Trash2 } from "lucide-react"; import { ArrowRightLeft, Plus, Trash2 } from "lucide-react";
import { useTranslation } from "next-i18next";
import { useHealthCheckAfterMutation } from "@/hooks/use-health-check-after-mutation"; import { useHealthCheckAfterMutation } from "@/hooks/use-health-check-after-mutation";
import type React from "react"; import type React from "react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
@@ -56,7 +55,6 @@ const TraefikPortsSchema = z.object({
type TraefikPortsForm = z.infer<typeof TraefikPortsSchema>; type TraefikPortsForm = z.infer<typeof TraefikPortsSchema>;
export const ManageTraefikPorts = ({ children, serverId }: Props) => { export const ManageTraefikPorts = ({ children, serverId }: Props) => {
const { t } = useTranslation("settings");
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const form = useForm<TraefikPortsForm>({ const form = useForm<TraefikPortsForm>({
@@ -84,7 +82,7 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
isExecuting: isHealthCheckExecuting, isExecuting: isHealthCheckExecuting,
} = useHealthCheckAfterMutation({ } = useHealthCheckAfterMutation({
initialDelay: 5000, initialDelay: 5000,
successMessage: t("settings.server.webServer.traefik.portsUpdated"), successMessage: "Ports updated successfully",
onSuccess: () => { onSuccess: () => {
refetchPorts(); refetchPorts();
setOpen(false); setOpen(false);
@@ -129,14 +127,12 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
<DialogContent className="sm:max-w-3xl"> <DialogContent className="sm:max-w-3xl">
<DialogHeader> <DialogHeader>
<DialogTitle className="flex items-center gap-2 text-xl"> <DialogTitle className="flex items-center gap-2 text-xl">
{t("settings.server.webServer.traefik.managePorts")} Additional Port Mappings
</DialogTitle> </DialogTitle>
<DialogDescription className="text-base w-full"> <DialogDescription className="text-base w-full">
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<div className="flex flex-col gap-1"> <div className="flex flex-col gap-1">
{t( Add or remove additional ports for Traefik
"settings.server.webServer.traefik.managePortsDescription",
)}
<span className="text-sm text-muted-foreground"> <span className="text-sm text-muted-foreground">
{fields.length} port mapping{fields.length !== 1 ? "s" : ""}{" "} {fields.length} port mapping{fields.length !== 1 ? "s" : ""}{" "}
configured configured
@@ -179,9 +175,7 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel className="text-sm font-medium text-muted-foreground"> <FormLabel className="text-sm font-medium text-muted-foreground">
{t( Target Port
"settings.server.webServer.traefik.targetPort",
)}
</FormLabel> </FormLabel>
<FormControl> <FormControl>
<Input <Input
@@ -210,9 +204,7 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel className="text-sm font-medium text-muted-foreground"> <FormLabel className="text-sm font-medium text-muted-foreground">
{t( Published Port
"settings.server.webServer.traefik.publishedPort",
)}
</FormLabel> </FormLabel>
<FormControl> <FormControl>
<Input <Input
@@ -135,7 +135,9 @@ export const UpdateServer = ({
<div className="flex items-center gap-1.5 rounded-full px-3 py-1 mr-2 bg-muted"> <div className="flex items-center gap-1.5 rounded-full px-3 py-1 mr-2 bg-muted">
<Server className="h-4 w-4 text-muted-foreground" /> <Server className="h-4 w-4 text-muted-foreground" />
<span className="text-sm text-muted-foreground"> <span className="text-sm text-muted-foreground">
{dokployVersion} | {releaseTag} {dokployVersion}{" "}
{(releaseTag === "canary" || releaseTag === "feature") &&
`(${releaseTag})`}
</span> </span>
</div> </div>
)} )}
@@ -88,6 +88,35 @@ export const DiscordIcon = ({ className }: Props) => {
</svg> </svg>
); );
}; };
export const TeamsIcon = ({ className }: Props) => {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
width="26"
height="36"
viewBox="0 0 512 476"
className={cn("size-9", className)}
>
<g>
<rect x="116" y="50" width="280" height="276" rx="64" fill="#6264A7" />
<rect x="236" y="138" width="180" height="224" rx="60" fill="#5059C9" />
<circle cx="122" cy="332" r="80" fill="#B2B4D3" />
<circle cx="370" cy="364" r="64" fill="#A6A7DC" />
<text
x="180"
y="270"
fill="#fff"
font-family="Segoe UI, Arial, sans-serif"
font-size="110"
font-weight="bold"
>
T
</text>
</g>
</svg>
);
};
export const LarkIcon = ({ className }: Props) => { export const LarkIcon = ({ className }: Props) => {
return ( return (
<svg <svg
+116 -114
View File
@@ -630,135 +630,137 @@ function SidebarLogo() {
</SidebarMenuButton> </SidebarMenuButton>
</DropdownMenuTrigger> </DropdownMenuTrigger>
<DropdownMenuContent <DropdownMenuContent
className="rounded-lg" className="rounded-lg max-h-[min(70vh,28rem)] flex flex-col"
align="start" align="start"
side={isMobile ? "bottom" : "right"} side={isMobile ? "bottom" : "right"}
sideOffset={4} sideOffset={4}
> >
<DropdownMenuLabel className="text-xs text-muted-foreground"> <DropdownMenuLabel className="text-xs text-muted-foreground shrink-0">
Organizations Organizations
</DropdownMenuLabel> </DropdownMenuLabel>
{organizations?.map((org) => { <div className="overflow-y-auto overflow-x-hidden min-h-0 -mx-1 px-1">
const isDefault = org.members?.[0]?.isDefault ?? false; {organizations?.map((org) => {
return ( const isDefault = org.members?.[0]?.isDefault ?? false;
<div return (
className="flex flex-row justify-between" <div
key={org.name} className="flex flex-row justify-between"
> key={org.name}
<DropdownMenuItem
onClick={async () => {
await authClient.organization.setActive({
organizationId: org.id,
});
window.location.reload();
}}
className="w-full gap-2 p-2"
> >
<div className="flex flex-col gap-1"> <DropdownMenuItem
<div className="flex items-center gap-2"> onClick={async () => {
{org.name} await authClient.organization.setActive({
</div>
</div>
<div className="flex size-6 items-center justify-center rounded-sm border">
<Logo
className={cn(
"transition-all",
state === "collapsed" ? "size-6" : "size-10",
)}
logoUrl={org.logo ?? undefined}
/>
</div>
</DropdownMenuItem>
<div className="flex items-center gap-2">
<Button
variant="ghost"
size="icon"
className={cn(
"group",
isDefault
? "hover:bg-yellow-500/10"
: "hover:bg-blue-500/10",
)}
isLoading={isSettingDefault && !isDefault}
disabled={isDefault}
onClick={async (e) => {
if (isDefault) return;
e.stopPropagation();
await setDefaultOrganization({
organizationId: org.id, organizationId: org.id,
}) });
.then(() => { window.location.reload();
refetch();
toast.success("Default organization updated");
})
.catch((error) => {
toast.error(
error?.message ||
"Error setting default organization",
);
});
}} }}
title={ className="w-full gap-2 p-2"
isDefault
? "Default organization"
: "Set as default"
}
> >
{isDefault ? ( <div className="flex flex-col gap-1">
<Star <div className="flex items-center gap-2">
fill="#eab308" {org.name}
stroke="#eab308" </div>
className="size-4 text-yellow-500" </div>
<div className="flex size-6 items-center justify-center rounded-sm border">
<Logo
className={cn(
"transition-all",
state === "collapsed" ? "size-6" : "size-10",
)}
logoUrl={org.logo ?? undefined}
/> />
) : ( </div>
<Star </DropdownMenuItem>
fill="none"
stroke="currentColor" <div className="flex items-center gap-2">
className="size-4 text-gray-400 group-hover:text-blue-500 transition-colors" <Button
/> variant="ghost"
)} size="icon"
</Button> className={cn(
{org.ownerId === session?.user?.id && ( "group",
<> isDefault
<AddOrganization organizationId={org.id} /> ? "hover:bg-yellow-500/10"
<DialogAction : "hover:bg-blue-500/10",
title="Delete Organization" )}
description="Are you sure you want to delete this organization?" isLoading={isSettingDefault && !isDefault}
type="destructive" disabled={isDefault}
onClick={async () => { onClick={async (e) => {
await deleteOrganization({ if (isDefault) return;
organizationId: org.id, e.stopPropagation();
await setDefaultOrganization({
organizationId: org.id,
})
.then(() => {
refetch();
toast.success("Default organization updated");
}) })
.then(() => { .catch((error) => {
refetch(); toast.error(
toast.success( error?.message ||
"Organization deleted successfully", "Error setting default organization",
); );
});
}}
title={
isDefault
? "Default organization"
: "Set as default"
}
>
{isDefault ? (
<Star
fill="#eab308"
stroke="#eab308"
className="size-4 text-yellow-500"
/>
) : (
<Star
fill="none"
stroke="currentColor"
className="size-4 text-gray-400 group-hover:text-blue-500 transition-colors"
/>
)}
</Button>
{org.ownerId === session?.user?.id && (
<>
<AddOrganization organizationId={org.id} />
<DialogAction
title="Delete Organization"
description="Are you sure you want to delete this organization?"
type="destructive"
onClick={async () => {
await deleteOrganization({
organizationId: org.id,
}) })
.catch((error) => { .then(() => {
toast.error( refetch();
error?.message || toast.success(
"Error deleting organization", "Organization deleted successfully",
); );
}); })
}} .catch((error) => {
> toast.error(
<Button error?.message ||
variant="ghost" "Error deleting organization",
size="icon" );
className="group hover:bg-red-500/10" });
isLoading={isRemoving} }}
> >
<Trash2 className="size-4 text-primary group-hover:text-red-500" /> <Button
</Button> variant="ghost"
</DialogAction> size="icon"
</> className="group hover:bg-red-500/10"
)} isLoading={isRemoving}
>
<Trash2 className="size-4 text-primary group-hover:text-red-500" />
</Button>
</DialogAction>
</>
)}
</div>
</div> </div>
</div> );
); })}
})} </div>
{(user?.role === "owner" || {(user?.role === "owner" ||
user?.role === "admin" || user?.role === "admin" ||
isCloud) && ( isCloud) && (
+13 -43
View File
@@ -10,18 +10,9 @@ import {
DropdownMenuSeparator, DropdownMenuSeparator,
DropdownMenuTrigger, DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"; } from "@/components/ui/dropdown-menu";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { authClient } from "@/lib/auth-client"; import { authClient } from "@/lib/auth-client";
import { Languages } from "@/lib/languages";
import { getFallbackAvatarInitials } from "@/lib/utils"; import { getFallbackAvatarInitials } from "@/lib/utils";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import useLocale from "@/utils/hooks/use-locale";
import { ModeToggle } from "../ui/modeToggle"; import { ModeToggle } from "../ui/modeToggle";
import { SidebarMenuButton } from "../ui/sidebar"; import { SidebarMenuButton } from "../ui/sidebar";
@@ -32,7 +23,6 @@ export const UserNav = () => {
const { data } = api.user.get.useQuery(); const { data } = api.user.get.useQuery();
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { locale, setLocale } = useLocale();
// const { mutateAsync } = api.auth.logout.useMutation(); // const { mutateAsync } = api.auth.logout.useMutation();
return ( return (
@@ -155,39 +145,19 @@ export const UserNav = () => {
</DropdownMenuItem> </DropdownMenuItem>
)} )}
<DropdownMenuSeparator /> <DropdownMenuSeparator />
<div className="flex items-center justify-between px-2 py-1.5"> <DropdownMenuItem
<DropdownMenuItem className="cursor-pointer"
className="cursor-pointer" onClick={async () => {
onClick={async () => { await authClient.signOut().then(() => {
await authClient.signOut().then(() => { router.push("/");
router.push("/"); });
}); // await mutateAsync().then(() => {
// await mutateAsync().then(() => { // router.push("/");
// router.push("/"); // });
// }); }}
}} >
> Log out
Log out </DropdownMenuItem>
</DropdownMenuItem>
<div className="w-32">
<Select
onValueChange={setLocale}
defaultValue={locale}
value={locale}
>
<SelectTrigger>
<SelectValue placeholder="Select Language" />
</SelectTrigger>
<SelectContent>
{Object.values(Languages).map((language) => (
<SelectItem key={language.code} value={language.code}>
{language.name}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
</div>
</DropdownMenuContent> </DropdownMenuContent>
</DropdownMenu> </DropdownMenu>
); );
@@ -2,9 +2,9 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { Plus, Trash2 } from "lucide-react"; import { Plus, Trash2 } from "lucide-react";
import { useState } from "react"; import { useEffect, useState } from "react";
import type { FieldArrayPath } from "react-hook-form"; import type { FieldArrayPath } from "react-hook-form";
import { useFieldArray, useForm } from "react-hook-form"; import { useFieldArray, useForm, useWatch } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
import { z } from "zod"; import { z } from "zod";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
@@ -28,6 +28,7 @@ import {
} from "@/components/ui/form"; } from "@/components/ui/form";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { useUrl } from "@/utils/hooks/use-url";
const DEFAULT_SCOPES = ["openid", "email", "profile"]; const DEFAULT_SCOPES = ["openid", "email", "profile"];
@@ -58,6 +59,7 @@ const oidcProviderSchema = z.object({
type OidcProviderForm = z.infer<typeof oidcProviderSchema>; type OidcProviderForm = z.infer<typeof oidcProviderSchema>;
interface RegisterOidcDialogProps { interface RegisterOidcDialogProps {
providerId?: string;
children: React.ReactNode; children: React.ReactNode;
} }
@@ -70,16 +72,86 @@ const formDefaultValues = {
scopes: [...DEFAULT_SCOPES], scopes: [...DEFAULT_SCOPES],
}; };
export function RegisterOidcDialog({ children }: RegisterOidcDialogProps) { function parseOidcConfig(oidcConfig: string | null): {
clientId?: string;
clientSecret?: string;
scopes?: string[];
} | null {
if (!oidcConfig) return null;
try {
const parsed = JSON.parse(oidcConfig) as {
clientId?: string;
clientSecret?: string;
scopes?: string[];
};
return {
clientId: parsed.clientId,
clientSecret: parsed.clientSecret,
scopes: Array.isArray(parsed.scopes) ? parsed.scopes : undefined,
};
} catch {
return null;
}
}
export function RegisterOidcDialog({
providerId,
children,
}: RegisterOidcDialogProps) {
const utils = api.useUtils(); const utils = api.useUtils();
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const { mutateAsync, isLoading } = api.sso.register.useMutation();
const { data } = api.sso.one.useQuery(
{ providerId: providerId ?? "" },
{ enabled: !!providerId && open },
);
const registerMutation = api.sso.register.useMutation();
const updateMutation = api.sso.update.useMutation();
const isEdit = !!providerId;
const mutateAsync = isEdit
? updateMutation.mutateAsync
: registerMutation.mutateAsync;
const isLoading = isEdit
? updateMutation.isLoading
: registerMutation.isLoading;
const form = useForm<OidcProviderForm>({ const form = useForm<OidcProviderForm>({
resolver: zodResolver(oidcProviderSchema), resolver: zodResolver(oidcProviderSchema),
defaultValues: formDefaultValues, defaultValues: formDefaultValues,
}); });
const watchedProviderId = useWatch({
control: form.control,
name: "providerId",
defaultValue: "",
});
const baseURL = useUrl();
useEffect(() => {
if (!data || !open) return;
const domains = data.domain
? data.domain
.split(",")
.map((d) => d.trim())
.filter(Boolean)
: [""];
if (domains.length === 0) domains.push("");
const oidc = parseOidcConfig(data.oidcConfig);
form.reset({
providerId: data.providerId,
issuer: data.issuer,
domains,
clientId: oidc?.clientId ?? "",
clientSecret: oidc?.clientSecret ?? "",
scopes:
oidc?.scopes && oidc.scopes.length > 0
? oidc.scopes
: [...DEFAULT_SCOPES],
});
}, [data, open, form]);
const { fields, append, remove } = useFieldArray({ const { fields, append, remove } = useFieldArray({
control: form.control, control: form.control,
name: "domains" as FieldArrayPath<OidcProviderForm>, name: "domains" as FieldArrayPath<OidcProviderForm>,
@@ -130,7 +202,11 @@ export function RegisterOidcDialog({ children }: RegisterOidcDialogProps) {
}, },
}); });
toast.success("OIDC provider registered successfully"); toast.success(
isEdit
? "OIDC provider updated successfully"
: "OIDC provider registered successfully",
);
form.reset(formDefaultValues); form.reset(formDefaultValues);
setOpen(false); setOpen(false);
await utils.sso.listProviders.invalidate(); await utils.sso.listProviders.invalidate();
@@ -146,11 +222,13 @@ export function RegisterOidcDialog({ children }: RegisterOidcDialogProps) {
<DialogTrigger asChild>{children}</DialogTrigger> <DialogTrigger asChild>{children}</DialogTrigger>
<DialogContent className="sm:max-w-[500px]"> <DialogContent className="sm:max-w-[500px]">
<DialogHeader> <DialogHeader>
<DialogTitle>Register OIDC provider</DialogTitle> <DialogTitle>
{isEdit ? "Update OIDC provider" : "Register OIDC provider"}
</DialogTitle>
<DialogDescription> <DialogDescription>
Add any OIDC-compliant identity provider (e.g. Okta, Azure AD, {isEdit
Google Workspace, Auth0, Keycloak). Discovery will fill endpoints ? "Change issuer, domains, client settings or scopes. Provider ID cannot be changed."
from the issuer URL when possible. : "Add any OIDC-compliant identity provider (e.g. Okta, Azure AD, Google Workspace, Auth0, Keycloak). Discovery will fill endpoints from the issuer URL when possible."}
</DialogDescription> </DialogDescription>
</DialogHeader> </DialogHeader>
<Form {...form}> <Form {...form}>
@@ -162,11 +240,28 @@ export function RegisterOidcDialog({ children }: RegisterOidcDialogProps) {
<FormItem> <FormItem>
<FormLabel>Provider ID</FormLabel> <FormLabel>Provider ID</FormLabel>
<FormControl> <FormControl>
<Input placeholder="e.g. okta or my-idp" {...field} /> <Input
placeholder="e.g. okta or my-idp"
{...field}
readOnly={isEdit}
className={isEdit ? "bg-muted" : undefined}
/>
</FormControl> </FormControl>
<FormDescription> <FormDescription>
Unique identifier; used in callback URL path. Unique identifier; used in callback URL path.
{isEdit && " Cannot be changed when editing."}
</FormDescription> </FormDescription>
{baseURL && (
<div className="rounded-md bg-muted px-3 py-2 text-xs">
<p className="font-medium text-muted-foreground">
Callback URL (configure in your IdP)
</p>
<p className="mt-0.5 break-all font-mono">
{baseURL}/api/auth/sso/callback/
{watchedProviderId?.trim() || "..."}
</p>
</div>
)}
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
)} )}
@@ -341,7 +436,7 @@ export function RegisterOidcDialog({ children }: RegisterOidcDialogProps) {
Cancel Cancel
</Button> </Button>
<Button type="submit" isLoading={isLoading}> <Button type="submit" isLoading={isLoading}>
Register provider {isEdit ? "Update provider" : "Register provider"}
</Button> </Button>
</DialogFooter> </DialogFooter>
</form> </form>
@@ -3,7 +3,12 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { Plus, Trash2 } from "lucide-react"; import { Plus, Trash2 } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { type FieldArrayPath, useFieldArray, useForm } from "react-hook-form"; import {
type FieldArrayPath,
useFieldArray,
useForm,
useWatch,
} from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
import { z } from "zod"; import { z } from "zod";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
@@ -28,6 +33,7 @@ import {
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { Textarea } from "@/components/ui/textarea"; import { Textarea } from "@/components/ui/textarea";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { useUrl } from "@/utils/hooks/use-url";
const domainsArraySchema = z const domainsArraySchema = z
.array(z.string().trim()) .array(z.string().trim())
@@ -58,6 +64,7 @@ const samlProviderSchema = z.object({
type SamlProviderForm = z.infer<typeof samlProviderSchema>; type SamlProviderForm = z.infer<typeof samlProviderSchema>;
interface RegisterSamlDialogProps { interface RegisterSamlDialogProps {
providerId?: string;
children: React.ReactNode; children: React.ReactNode;
} }
@@ -70,24 +77,83 @@ const formDefaultValues: SamlProviderForm = {
idpMetadataXml: "", idpMetadataXml: "",
}; };
export function RegisterSamlDialog({ children }: RegisterSamlDialogProps) { function parseSamlConfig(samlConfig: string | null): {
entryPoint?: string;
cert?: string;
idpMetadataXml?: string;
} | null {
if (!samlConfig) return null;
try {
const parsed = JSON.parse(samlConfig) as {
entryPoint?: string;
cert?: string;
idpMetadata?: { metadata?: string };
};
return {
entryPoint: parsed.entryPoint,
cert: parsed.cert,
idpMetadataXml: parsed.idpMetadata?.metadata,
};
} catch {
return null;
}
}
export function RegisterSamlDialog({
providerId,
children,
}: RegisterSamlDialogProps) {
const utils = api.useUtils(); const utils = api.useUtils();
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const { mutateAsync, isLoading } = api.sso.register.useMutation();
const [baseURL, setBaseURL] = useState(""); const { data } = api.sso.one.useQuery(
{ providerId: providerId ?? "" },
{ enabled: !!providerId && open },
);
const registerMutation = api.sso.register.useMutation();
const updateMutation = api.sso.update.useMutation();
useEffect(() => { const isEdit = !!providerId;
if (typeof window !== "undefined") { const mutateAsync = isEdit
setBaseURL(window.location.origin); ? updateMutation.mutateAsync
} : registerMutation.mutateAsync;
}, []); const isLoading = isEdit
? updateMutation.isLoading
: registerMutation.isLoading;
const baseURL = useUrl();
const form = useForm<SamlProviderForm>({ const form = useForm<SamlProviderForm>({
resolver: zodResolver(samlProviderSchema), resolver: zodResolver(samlProviderSchema),
defaultValues: formDefaultValues, defaultValues: formDefaultValues,
}); });
useEffect(() => {
if (!data || !open) return;
const domains = data.domain
? data.domain
.split(",")
.map((d) => d.trim())
.filter(Boolean)
: [""];
if (domains.length === 0) domains.push("");
const saml = parseSamlConfig(data.samlConfig);
form.reset({
providerId: data.providerId,
issuer: data.issuer,
domains,
entryPoint: saml?.entryPoint ?? "",
cert: saml?.cert ?? "",
idpMetadataXml: saml?.idpMetadataXml ?? "",
});
}, [data, open, form]);
const watchedProviderId = useWatch({
control: form.control,
name: "providerId",
defaultValue: "",
});
const { fields, append, remove } = useFieldArray({ const { fields, append, remove } = useFieldArray({
control: form.control, control: form.control,
name: "domains" as FieldArrayPath<SamlProviderForm>, name: "domains" as FieldArrayPath<SamlProviderForm>,
@@ -133,7 +199,11 @@ export function RegisterSamlDialog({ children }: RegisterSamlDialogProps) {
}, },
}); });
toast.success("SAML provider registered successfully"); toast.success(
isEdit
? "SAML provider updated successfully"
: "SAML provider registered successfully",
);
form.reset(formDefaultValues); form.reset(formDefaultValues);
setOpen(false); setOpen(false);
await utils.sso.listProviders.invalidate(); await utils.sso.listProviders.invalidate();
@@ -149,10 +219,13 @@ export function RegisterSamlDialog({ children }: RegisterSamlDialogProps) {
<DialogTrigger asChild>{children}</DialogTrigger> <DialogTrigger asChild>{children}</DialogTrigger>
<DialogContent className="sm:max-w-[500px] max-h-[90vh] overflow-y-auto"> <DialogContent className="sm:max-w-[500px] max-h-[90vh] overflow-y-auto">
<DialogHeader> <DialogHeader>
<DialogTitle>Register SAML provider</DialogTitle> <DialogTitle>
{isEdit ? "Update SAML provider" : "Register SAML provider"}
</DialogTitle>
<DialogDescription> <DialogDescription>
Add a SAML 2.0 identity provider (e.g. Okta SAML, Azure AD SAML, {isEdit
OneLogin). You need the IdP&apos;s SSO URL and signing certificate. ? "Change issuer, domains, entry point or certificate. Provider ID cannot be changed."
: "Add a SAML 2.0 identity provider (e.g. Okta SAML, Azure AD SAML, OneLogin). You need the IdP's SSO URL and signing certificate."}
</DialogDescription> </DialogDescription>
</DialogHeader> </DialogHeader>
<Form {...form}> <Form {...form}>
@@ -167,8 +240,26 @@ export function RegisterSamlDialog({ children }: RegisterSamlDialogProps) {
<Input <Input
placeholder="e.g. okta-saml or azure-saml" placeholder="e.g. okta-saml or azure-saml"
{...field} {...field}
readOnly={isEdit}
className={isEdit ? "bg-muted" : undefined}
/> />
</FormControl> </FormControl>
{isEdit && (
<FormDescription>
Cannot be changed when editing.
</FormDescription>
)}
{baseURL && (
<div className="rounded-md bg-muted px-3 py-2 text-xs">
<p className="font-medium text-muted-foreground">
Callback URL (configure in your IdP)
</p>
<p className="mt-0.5 break-all font-mono">
{baseURL}/api/auth/sso/saml2/callback/
{watchedProviderId?.trim() || "..."}
</p>
</div>
)}
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
)} )}
@@ -317,7 +408,7 @@ export function RegisterSamlDialog({ children }: RegisterSamlDialogProps) {
Cancel Cancel
</Button> </Button>
<Button type="submit" isLoading={isLoading}> <Button type="submit" isLoading={isLoading}>
Register provider {isEdit ? "Update provider" : "Register provider"}
</Button> </Button>
</DialogFooter> </DialogFooter>
</form> </form>
@@ -1,7 +1,15 @@
"use client"; "use client";
import { Eye, Loader2, LogIn, Trash2 } from "lucide-react"; import {
import { useEffect, useState } from "react"; Eye,
Loader2,
LogIn,
Pencil,
Plus,
Shield,
Trash2,
} from "lucide-react";
import { useState } from "react";
import { toast } from "sonner"; import { toast } from "sonner";
import { DialogAction } from "@/components/shared/dialog-action"; import { DialogAction } from "@/components/shared/dialog-action";
import { Badge } from "@/components/ui/badge"; import { Badge } from "@/components/ui/badge";
@@ -21,7 +29,9 @@ import {
DialogHeader, DialogHeader,
DialogTitle, DialogTitle,
} from "@/components/ui/dialog"; } from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { useUrl } from "@/utils/hooks/use-url";
import { RegisterOidcDialog } from "./register-oidc-dialog"; import { RegisterOidcDialog } from "./register-oidc-dialog";
import { RegisterSamlDialog } from "./register-saml-dialog"; import { RegisterSamlDialog } from "./register-saml-dialog";
@@ -67,29 +77,108 @@ export const SSOSettings = () => {
const utils = api.useUtils(); const utils = api.useUtils();
const [detailsProvider, setDetailsProvider] = const [detailsProvider, setDetailsProvider] =
useState<ProviderForDetails | null>(null); useState<ProviderForDetails | null>(null);
const [baseURL, setBaseURL] = useState(""); const baseURL = useUrl();
const [manageOriginsOpen, setManageOriginsOpen] = useState(false);
useEffect(() => { const [editingOrigin, setEditingOrigin] = useState<string | null>(null);
if (typeof window !== "undefined") { const [editingValue, setEditingValue] = useState("");
setBaseURL(window.location.origin); const [newOriginInput, setNewOriginInput] = useState("");
}
}, []);
const { data: providers, isLoading } = api.sso.listProviders.useQuery(); const { data: providers, isLoading } = api.sso.listProviders.useQuery();
const { data: userData } = api.user.get.useQuery(undefined, {
enabled: manageOriginsOpen,
});
const { mutateAsync: deleteProvider, isLoading: isDeleting } = const { mutateAsync: deleteProvider, isLoading: isDeleting } =
api.sso.deleteProvider.useMutation(); api.sso.deleteProvider.useMutation();
const { mutateAsync: addTrustedOrigin, isLoading: isAddingOrigin } =
api.sso.addTrustedOrigin.useMutation();
const { mutateAsync: removeTrustedOrigin, isLoading: isRemovingOrigin } =
api.sso.removeTrustedOrigin.useMutation();
const { mutateAsync: updateTrustedOrigin, isLoading: isUpdatingOrigin } =
api.sso.updateTrustedOrigin.useMutation();
const trustedOrigins = userData?.user?.trustedOrigins ?? [];
const handleAddOrigin = async () => {
const value = newOriginInput.trim();
if (!value) return;
try {
await addTrustedOrigin({ origin: value });
toast.success("Trusted origin added");
setNewOriginInput("");
await utils.user.get.invalidate();
} catch (err) {
toast.error(
err instanceof Error ? err.message : "Failed to add trusted origin",
);
}
};
const handleRemoveOrigin = async (origin: string) => {
try {
await removeTrustedOrigin({ origin });
toast.success("Trusted origin removed");
if (editingOrigin === origin) setEditingOrigin(null);
await utils.user.get.invalidate();
} catch (err) {
toast.error(
err instanceof Error ? err.message : "Failed to remove trusted origin",
);
}
};
const handleStartEdit = (origin: string) => {
setEditingOrigin(origin);
setEditingValue(origin);
};
const handleSaveEdit = async () => {
if (editingOrigin == null || !editingValue.trim()) {
setEditingOrigin(null);
return;
}
try {
await updateTrustedOrigin({
oldOrigin: editingOrigin,
newOrigin: editingValue.trim(),
});
toast.success("Trusted origin updated");
setEditingOrigin(null);
setEditingValue("");
await utils.user.get.invalidate();
} catch (err) {
toast.error(
err instanceof Error ? err.message : "Failed to update trusted origin",
);
}
};
const handleCancelEdit = () => {
setEditingOrigin(null);
setEditingValue("");
};
return ( return (
<div className="flex flex-col gap-4 rounded-lg border p-4"> <div className="flex flex-col gap-4 rounded-lg border p-4">
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between">
<div className="flex items-center gap-2"> <div className="flex flex-col gap-2">
<LogIn className="size-6 text-muted-foreground" /> <div className="flex items-center gap-2">
<CardTitle className="text-xl">Single Sign-On (SSO)</CardTitle> <LogIn className="size-6 text-muted-foreground" />
<CardTitle className="text-xl">Single Sign-On (SSO)</CardTitle>
</div>
<CardDescription>
Configure OIDC or SAML identity providers for enterprise sign-in.
Users can sign in with their organization&apos;s IdP.
</CardDescription>
</div> </div>
<CardDescription> <Button
Configure OIDC or SAML identity providers for enterprise sign-in. variant="outline"
Users can sign in with their organization&apos;s IdP. size="sm"
</CardDescription> onClick={() => setManageOriginsOpen(true)}
className="shrink-0"
>
<Shield className="mr-2 size-4" />
Manage origins
</Button>
</div> </div>
{isLoading ? ( {isLoading ? (
@@ -177,6 +266,22 @@ export const SSOSettings = () => {
<Eye className="mr-1 size-3" /> <Eye className="mr-1 size-3" />
View details View details
</Button> </Button>
{isOidc && (
<RegisterOidcDialog providerId={provider.providerId}>
<Button variant="ghost" size="sm">
<Pencil className="mr-1 size-3" />
Edit
</Button>
</RegisterOidcDialog>
)}
{isSaml && (
<RegisterSamlDialog providerId={provider.providerId}>
<Button variant="ghost" size="sm">
<Pencil className="mr-1 size-3" />
Edit
</Button>
</RegisterSamlDialog>
)}
<DialogAction <DialogAction
title="Remove SSO provider" title="Remove SSO provider"
description={`Remove provider "${provider.providerId}"? Users will no longer be able to sign in with this IdP.`} description={`Remove provider "${provider.providerId}"? Users will no longer be able to sign in with this IdP.`}
@@ -256,8 +361,7 @@ export const SSOSettings = () => {
<DialogHeader> <DialogHeader>
<DialogTitle>SSO provider details</DialogTitle> <DialogTitle>SSO provider details</DialogTitle>
<DialogDescription> <DialogDescription>
View-only. To change settings, remove this provider and add it Use Edit to change provider settings (OIDC or SAML).
again with the new values.
</DialogDescription> </DialogDescription>
</DialogHeader> </DialogHeader>
<div className="grid gap-3 py-2"> <div className="grid gap-3 py-2">
@@ -366,6 +470,128 @@ export const SSOSettings = () => {
)} )}
</DialogContent> </DialogContent>
</Dialog> </Dialog>
<Dialog open={manageOriginsOpen} onOpenChange={setManageOriginsOpen}>
<DialogContent className="sm:max-w-[480px]">
<DialogHeader>
<DialogTitle className="flex items-center gap-2">
<Shield className="size-5" />
Trusted origins
</DialogTitle>
<DialogDescription>
Manage allowed origins for SSO callbacks. Add, edit, or remove
origins for your account.
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-2">
<div className="space-y-2">
<span className="text-sm font-medium">Current origins</span>
{trustedOrigins.length === 0 ? (
<p className="rounded-md border border-dashed bg-muted/30 px-3 py-4 text-center text-sm text-muted-foreground">
No trusted origins yet. Add one below.
</p>
) : (
<ul className="flex flex-col gap-2">
{trustedOrigins.map((origin) => (
<li
key={origin}
className="flex items-center gap-2 rounded-md border bg-muted/30 px-3 py-2"
>
{editingOrigin === origin ? (
<>
<Input
value={editingValue}
onChange={(e) => setEditingValue(e.target.value)}
placeholder="https://..."
className="flex-1 font-mono text-sm"
autoFocus
/>
<Button
size="sm"
onClick={handleSaveEdit}
disabled={!editingValue.trim() || isUpdatingOrigin}
>
Save
</Button>
<Button
size="sm"
variant="ghost"
onClick={handleCancelEdit}
>
Cancel
</Button>
</>
) : (
<>
<span className="flex-1 break-all font-mono text-sm">
{origin}
</span>
<Button
variant="ghost"
size="icon"
className="size-8 shrink-0"
onClick={() => handleStartEdit(origin)}
>
<Pencil className="size-3.5" />
</Button>
<DialogAction
title="Remove trusted origin"
description={`Remove "${origin}" from trusted origins?`}
type="destructive"
onClick={async () => handleRemoveOrigin(origin)}
>
<Button
variant="ghost"
size="icon"
className="size-8 shrink-0 text-destructive hover:text-destructive"
disabled={isRemovingOrigin}
>
<Trash2 className="size-3.5" />
</Button>
</DialogAction>
</>
)}
</li>
))}
</ul>
)}
</div>
<div className="space-y-2">
<span className="text-sm font-medium">Add trusted origin</span>
<div className="flex gap-2">
<Input
value={newOriginInput}
onChange={(e) => setNewOriginInput(e.target.value)}
placeholder="https://example.com"
className="font-mono text-sm"
onKeyDown={(e) => {
if (e.key === "Enter") {
e.preventDefault();
void handleAddOrigin();
}
}}
/>
<Button
size="sm"
onClick={handleAddOrigin}
disabled={!newOriginInput.trim() || isAddingOrigin}
>
<Plus className="mr-1 size-4" />
Add
</Button>
</div>
</div>
</div>
<DialogFooter>
<Button
variant="outline"
onClick={() => setManageOriginsOpen(false)}
>
Close
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div> </div>
); );
}; };
@@ -0,0 +1 @@
ALTER TABLE "sso_provider" ADD COLUMN "created_at" timestamp DEFAULT now() NOT NULL;
@@ -0,0 +1,8 @@
ALTER TYPE "public"."notificationType" ADD VALUE 'teams';--> statement-breakpoint
CREATE TABLE "teams" (
"teamsId" text PRIMARY KEY NOT NULL,
"webhookUrl" text NOT NULL
);
--> statement-breakpoint
ALTER TABLE "notification" ADD COLUMN "teamsId" text;--> statement-breakpoint
ALTER TABLE "notification" ADD CONSTRAINT "notification_teamsId_teams_teamsId_fk" FOREIGN KEY ("teamsId") REFERENCES "public"."teams"("teamsId") ON DELETE cascade ON UPDATE no action;
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+14
View File
@@ -1002,6 +1002,20 @@
"when": 1770615019498, "when": 1770615019498,
"tag": "0142_outstanding_tusk", "tag": "0142_outstanding_tusk",
"breakpoints": true "breakpoints": true
},
{
"idx": 143,
"version": "7",
"when": 1770961667210,
"tag": "0143_brown_ultron",
"breakpoints": true
},
{
"idx": 144,
"version": "7",
"when": 1771297084611,
"tag": "0144_odd_gunslinger",
"breakpoints": true
} }
] ]
} }
-29
View File
@@ -1,29 +0,0 @@
/**
* Sorted list based off of population of the country / speakers of the language.
*/
export const Languages = {
english: { code: "en", name: "English" },
spanish: { code: "es", name: "Español" },
chineseSimplified: { code: "zh-Hans", name: "简体中文" },
chineseTraditional: { code: "zh-Hant", name: "繁體中文" },
portuguese: { code: "pt-br", name: "Português" },
russian: { code: "ru", name: "Русский" },
japanese: { code: "ja", name: "日本語" },
german: { code: "de", name: "Deutsch" },
korean: { code: "ko", name: "한국어" },
french: { code: "fr", name: "Français" },
turkish: { code: "tr", name: "Türkçe" },
italian: { code: "it", name: "Italiano" },
polish: { code: "pl", name: "Polski" },
ukrainian: { code: "uk", name: "Українська" },
persian: { code: "fa", name: "فارسی" },
dutch: { code: "nl", name: "Nederlands" },
indonesian: { code: "id", name: "Bahasa Indonesia" },
kazakh: { code: "kz", name: "Қазақ" },
norwegian: { code: "no", name: "Norsk" },
azerbaijani: { code: "az", name: "Azərbaycan" },
malayalam: { code: "ml", name: "മലയാളം" },
};
export type Language = keyof typeof Languages;
export type LanguageCode = (typeof Languages)[keyof typeof Languages]["code"];
-9
View File
@@ -10,15 +10,6 @@ const nextConfig = {
ignoreBuildErrors: true, ignoreBuildErrors: true,
}, },
transpilePackages: ["@dokploy/server"], transpilePackages: ["@dokploy/server"],
/**
* If you are using `appDir` then you must comment the below `i18n` config out.
*
* @see https://github.com/vercel/next.js/issues/41980
*/
i18n: {
locales: ["en"],
defaultLocale: "en",
},
async headers() { async headers() {
return [ return [
{ {
+12 -15
View File
@@ -1,6 +1,6 @@
{ {
"name": "dokploy", "name": "dokploy",
"version": "v0.27.0", "version": "v0.27.1",
"private": true, "private": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"type": "module", "type": "module",
@@ -41,13 +41,13 @@
"dependencies": { "dependencies": {
"resend": "^6.0.2", "resend": "^6.0.2",
"@better-auth/sso": "1.4.18", "@better-auth/sso": "1.4.18",
"@ai-sdk/anthropic": "^2.0.5", "@ai-sdk/anthropic": "^3.0.44",
"@ai-sdk/azure": "^2.0.16", "@ai-sdk/azure": "^3.0.30",
"@ai-sdk/cohere": "^2.0.4", "@ai-sdk/cohere": "^3.0.21",
"@ai-sdk/deepinfra": "^1.0.10", "@ai-sdk/deepinfra": "^2.0.34",
"@ai-sdk/mistral": "^2.0.7", "@ai-sdk/mistral": "^3.0.20",
"@ai-sdk/openai": "^2.0.16", "@ai-sdk/openai": "^3.0.29",
"@ai-sdk/openai-compatible": "^1.0.10", "@ai-sdk/openai-compatible": "^2.0.30",
"@codemirror/autocomplete": "^6.18.6", "@codemirror/autocomplete": "^6.18.6",
"@codemirror/lang-json": "^6.0.1", "@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-yaml": "^6.1.2", "@codemirror/lang-yaml": "^6.1.2",
@@ -95,8 +95,8 @@
"@xterm/addon-clipboard": "0.1.0", "@xterm/addon-clipboard": "0.1.0",
"@xterm/xterm": "^5.5.0", "@xterm/xterm": "^5.5.0",
"adm-zip": "^0.5.16", "adm-zip": "^0.5.16",
"ai": "^5.0.17", "ai": "^6.0.86",
"ai-sdk-ollama": "^0.5.1", "ai-sdk-ollama": "^3.7.0",
"bcrypt": "5.1.1", "bcrypt": "5.1.1",
"better-auth": "1.4.18", "better-auth": "1.4.18",
"bl": "6.0.11", "bl": "6.0.11",
@@ -113,7 +113,6 @@
"drizzle-orm": "^0.41.0", "drizzle-orm": "^0.41.0",
"drizzle-zod": "0.5.1", "drizzle-zod": "0.5.1",
"fancy-ansi": "^0.1.3", "fancy-ansi": "^0.1.3",
"i18next": "^23.16.8",
"input-otp": "^1.4.2", "input-otp": "^1.4.2",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"lodash": "4.17.21", "lodash": "4.17.21",
@@ -121,7 +120,6 @@
"micromatch": "4.0.8", "micromatch": "4.0.8",
"nanoid": "3.3.11", "nanoid": "3.3.11",
"next": "^16.1.6", "next": "^16.1.6",
"next-i18next": "^15.4.2",
"next-themes": "^0.2.1", "next-themes": "^0.2.1",
"nextjs-toploader": "^3.9.17", "nextjs-toploader": "^3.9.17",
"node-os-utils": "2.0.1", "node-os-utils": "2.0.1",
@@ -139,7 +137,6 @@
"react-day-picker": "8.10.1", "react-day-picker": "8.10.1",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-hook-form": "^7.56.4", "react-hook-form": "^7.56.4",
"react-i18next": "^15.5.2",
"react-markdown": "^9.1.0", "react-markdown": "^9.1.0",
"recharts": "^2.15.3", "recharts": "^2.15.3",
"slugify": "^1.6.6", "slugify": "^1.6.6",
@@ -147,7 +144,7 @@
"ssh2": "1.15.0", "ssh2": "1.15.0",
"stripe": "17.2.0", "stripe": "17.2.0",
"superjson": "^2.2.2", "superjson": "^2.2.2",
"swagger-ui-react": "^5.22.0", "swagger-ui-react": "^5.31.1",
"tailwind-merge": "^2.6.0", "tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"toml": "3.0.0", "toml": "3.0.0",
@@ -156,7 +153,7 @@
"ws": "8.16.0", "ws": "8.16.0",
"xterm-addon-fit": "^0.8.0", "xterm-addon-fit": "^0.8.0",
"yaml": "2.8.1", "yaml": "2.8.1",
"zod": "^3.25.32", "zod": "^3.25.76",
"zod-form-data": "^2.0.7", "zod-form-data": "^2.0.7",
"semver": "7.7.3" "semver": "7.7.3"
}, },
+1 -13
View File
@@ -4,13 +4,11 @@ import type { NextPage } from "next";
import type { AppProps } from "next/app"; import type { AppProps } from "next/app";
import { Inter } from "next/font/google"; import { Inter } from "next/font/google";
import Head from "next/head"; import Head from "next/head";
import { appWithTranslation } from "next-i18next";
import { ThemeProvider } from "next-themes"; import { ThemeProvider } from "next-themes";
import NextTopLoader from "nextjs-toploader"; import NextTopLoader from "nextjs-toploader";
import type { ReactElement, ReactNode } from "react"; import type { ReactElement, ReactNode } from "react";
import { SearchCommand } from "@/components/dashboard/search-command"; import { SearchCommand } from "@/components/dashboard/search-command";
import { Toaster } from "@/components/ui/sonner"; import { Toaster } from "@/components/ui/sonner";
import { Languages } from "@/lib/languages";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
const inter = Inter({ subsets: ["latin"] }); const inter = Inter({ subsets: ["latin"] });
@@ -58,14 +56,4 @@ const MyApp = ({
); );
}; };
export default api.withTRPC( export default api.withTRPC(MyApp);
appWithTranslation(MyApp, {
i18n: {
defaultLocale: "en",
locales: Object.values(Languages).map((language) => language.code),
localeDetection: false,
},
fallbackLng: "en",
keySeparator: false,
}),
);
@@ -152,6 +152,10 @@ export default async function handler(
normalizedCommits = req.body?.commits?.flatMap( normalizedCommits = req.body?.commits?.flatMap(
(commit: any) => commit.modified, (commit: any) => commit.modified,
); );
} else if (provider === "soft-serve") {
normalizedCommits = req.body?.commits?.flatMap(
(commit: any) => commit.modified,
);
} }
const shouldDeployPaths = shouldDeploy( const shouldDeployPaths = shouldDeploy(
@@ -439,6 +443,13 @@ export const extractCommitMessage = (headers: any, body: any) => {
: "NEW COMMIT"; : "NEW COMMIT";
} }
// Soft Serve
if (headers["x-softserve-event"]) {
return body.commits && body.commits.length > 0
? body.commits[0].message
: "NEW COMMIT";
}
if (headers["user-agent"]?.includes("Go-http-client")) { if (headers["user-agent"]?.includes("Go-http-client")) {
if (body.push_data && body.repository) { if (body.push_data && body.repository) {
return `DockerHub image pushed: ${body.repository.repo_name}:${body.push_data.tag} by ${body.push_data.pusher}`; return `DockerHub image pushed: ${body.repository.repo_name}:${body.push_data.tag} by ${body.push_data.pusher}`;
@@ -476,6 +487,11 @@ export const extractHash = (headers: any, body: any) => {
return body.after || "NEW COMMIT"; return body.after || "NEW COMMIT";
} }
// Soft Serve
if (headers["x-softserve-event"]) {
return body.after || "NEW COMMIT";
}
return ""; return "";
}; };
@@ -484,7 +500,10 @@ export const extractBranchName = (headers: any, body: any) => {
return body?.ref?.replace("refs/heads/", ""); return body?.ref?.replace("refs/heads/", "");
} }
if (headers["x-gitlab-event"]) { if (
headers["x-gitlab-event"] ||
headers["x-softserve-event"]?.includes("push")
) {
return body?.ref ? body?.ref.replace("refs/heads/", "") : null; return body?.ref ? body?.ref.replace("refs/heads/", "") : null;
} }
@@ -512,6 +531,10 @@ export const getProviderByHeader = (headers: any) => {
return "bitbucket"; return "bitbucket";
} }
if (headers["x-softserve-event"]) {
return "soft-serve";
}
return null; return null;
}; };
@@ -6,7 +6,6 @@ import superjson from "superjson";
import { AiForm } from "@/components/dashboard/settings/ai-form"; import { AiForm } from "@/components/dashboard/settings/ai-form";
import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { DashboardLayout } from "@/components/layouts/dashboard-layout";
import { appRouter } from "@/server/api/root"; import { appRouter } from "@/server/api/root";
import { getLocale, serverSideTranslations } from "@/utils/i18n";
const Page = () => { const Page = () => {
return ( return (
@@ -26,7 +25,6 @@ export async function getServerSideProps(
) { ) {
const { req, res } = ctx; const { req, res } = ctx;
const { user, session } = await validateRequest(req); const { user, session } = await validateRequest(req);
const locale = getLocale(req.cookies);
const helpers = createServerSideHelpers({ const helpers = createServerSideHelpers({
router: appRouter, router: appRouter,
@@ -55,7 +53,6 @@ export async function getServerSideProps(
return { return {
props: { props: {
trpcState: helpers.dehydrate(), trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["settings"])),
}, },
}; };
} }
@@ -7,7 +7,6 @@ import { DashboardLayout } from "@/components/layouts/dashboard-layout";
import { LicenseKeySettings } from "@/components/proprietary/license-keys/license-key"; import { LicenseKeySettings } from "@/components/proprietary/license-keys/license-key";
import { Card } from "@/components/ui/card"; import { Card } from "@/components/ui/card";
import { appRouter } from "@/server/api/root"; import { appRouter } from "@/server/api/root";
import { getLocale, serverSideTranslations } from "@/utils/i18n";
const Page = () => { const Page = () => {
return ( return (
@@ -35,7 +34,6 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>, ctx: GetServerSidePropsContext<{ serviceId: string }>,
) { ) {
const { req, res } = ctx; const { req, res } = ctx;
const locale = await getLocale(req.cookies);
const { user, session } = await validateRequest(ctx.req); const { user, session } = await validateRequest(ctx.req);
if (!user) { if (!user) {
return { return {
@@ -70,7 +68,6 @@ export async function getServerSideProps(
return { return {
props: { props: {
trpcState: helpers.dehydrate(), trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["settings"])),
}, },
}; };
} }
@@ -9,7 +9,6 @@ import { ProfileForm } from "@/components/dashboard/settings/profile/profile-for
import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { DashboardLayout } from "@/components/layouts/dashboard-layout";
import { appRouter } from "@/server/api/root"; import { appRouter } from "@/server/api/root";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { getLocale, serverSideTranslations } from "@/utils/i18n";
const Page = () => { const Page = () => {
const { data } = api.user.get.useQuery(); const { data } = api.user.get.useQuery();
@@ -37,7 +36,6 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>, ctx: GetServerSidePropsContext<{ serviceId: string }>,
) { ) {
const { req, res } = ctx; const { req, res } = ctx;
const locale = getLocale(req.cookies);
const { user, session } = await validateRequest(req); const { user, session } = await validateRequest(req);
const helpers = createServerSideHelpers({ const helpers = createServerSideHelpers({
@@ -67,7 +65,6 @@ export async function getServerSideProps(
return { return {
props: { props: {
trpcState: helpers.dehydrate(), trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["settings"])),
}, },
}; };
} }
@@ -10,7 +10,6 @@ import { DashboardLayout } from "@/components/layouts/dashboard-layout";
import { Card } from "@/components/ui/card"; import { Card } from "@/components/ui/card";
import { appRouter } from "@/server/api/root"; import { appRouter } from "@/server/api/root";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { getLocale, serverSideTranslations } from "@/utils/i18n";
const Page = () => { const Page = () => {
const { data: user } = api.user.get.useQuery(); const { data: user } = api.user.get.useQuery();
@@ -42,7 +41,6 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>, ctx: GetServerSidePropsContext<{ serviceId: string }>,
) { ) {
const { req, res } = ctx; const { req, res } = ctx;
const locale = await getLocale(req.cookies);
if (IS_CLOUD) { if (IS_CLOUD) {
return { return {
redirect: { redirect: {
@@ -85,7 +83,6 @@ export async function getServerSideProps(
return { return {
props: { props: {
trpcState: helpers.dehydrate(), trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["settings"])),
}, },
}; };
} }
@@ -6,7 +6,6 @@ import superjson from "superjson";
import { ShowServers } from "@/components/dashboard/settings/servers/show-servers"; import { ShowServers } from "@/components/dashboard/settings/servers/show-servers";
import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { DashboardLayout } from "@/components/layouts/dashboard-layout";
import { appRouter } from "@/server/api/root"; import { appRouter } from "@/server/api/root";
import { getLocale, serverSideTranslations } from "@/utils/i18n";
const Page = () => { const Page = () => {
return ( return (
@@ -25,7 +24,6 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>, ctx: GetServerSidePropsContext<{ serviceId: string }>,
) { ) {
const { req, res } = ctx; const { req, res } = ctx;
const locale = await getLocale(req.cookies);
const { user, session } = await validateRequest(req); const { user, session } = await validateRequest(req);
if (!user) { if (!user) {
return { return {
@@ -61,7 +59,6 @@ export async function getServerSideProps(
return { return {
props: { props: {
trpcState: helpers.dehydrate(), trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["settings"])),
}, },
}; };
} }
@@ -8,7 +8,6 @@ import { EnterpriseFeatureGate } from "@/components/proprietary/enterprise-featu
import { SSOSettings } from "@/components/proprietary/sso/sso-settings"; import { SSOSettings } from "@/components/proprietary/sso/sso-settings";
import { Card } from "@/components/ui/card"; import { Card } from "@/components/ui/card";
import { appRouter } from "@/server/api/root"; import { appRouter } from "@/server/api/root";
import { getLocale, serverSideTranslations } from "@/utils/i18n";
const Page = () => { const Page = () => {
return ( return (
@@ -43,7 +42,6 @@ Page.getLayout = (page: ReactElement) => {
export async function getServerSideProps(ctx: GetServerSidePropsContext) { export async function getServerSideProps(ctx: GetServerSidePropsContext) {
const { req, res } = ctx; const { req, res } = ctx;
const locale = await getLocale(req.cookies);
const { user, session } = await validateRequest(ctx.req); const { user, session } = await validateRequest(ctx.req);
if (!user) { if (!user) {
return { return {
@@ -78,7 +76,6 @@ export async function getServerSideProps(ctx: GetServerSidePropsContext) {
return { return {
props: { props: {
trpcState: helpers.dehydrate(), trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["settings"])),
}, },
}; };
} }
-1
View File
@@ -254,7 +254,6 @@ export default function Home({ IS_CLOUD }: Props) {
onChange={setTwoFactorCode} onChange={setTwoFactorCode}
maxLength={6} maxLength={6}
pattern={REGEXP_ONLY_DIGITS} pattern={REGEXP_ONLY_DIGITS}
autoComplete="off"
autoFocus autoFocus
> >
<InputOTPGroup> <InputOTPGroup>
@@ -1,6 +1,7 @@
import { import {
addNewService, addNewService,
checkServiceAccess, checkServiceAccess,
clearOldDeployments,
createApplication, createApplication,
deleteAllMiddlewares, deleteAllMiddlewares,
findApplicationById, findApplicationById,
@@ -746,6 +747,23 @@ export const applicationRouter = createTRPCRouter({
} }
await cleanQueuesByApplication(input.applicationId); await cleanQueuesByApplication(input.applicationId);
}), }),
clearDeployments: protectedProcedure
.input(apiFindOneApplication)
.mutation(async ({ input, ctx }) => {
const application = await findApplicationById(input.applicationId);
if (
application.environment.project.organizationId !==
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
message:
"You are not authorized to clear deployments for this application",
});
}
await clearOldDeployments(application.appName, application.serverId);
return true;
}),
killBuild: protectedProcedure killBuild: protectedProcedure
.input(apiFindOneApplication) .input(apiFindOneApplication)
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
@@ -2,6 +2,7 @@ import {
addDomainToCompose, addDomainToCompose,
addNewService, addNewService,
checkServiceAccess, checkServiceAccess,
clearOldDeployments,
cloneCompose, cloneCompose,
createCommand, createCommand,
createCompose, createCompose,
@@ -263,6 +264,23 @@ export const composeRouter = createTRPCRouter({
await cleanQueuesByCompose(input.composeId); await cleanQueuesByCompose(input.composeId);
return { success: true, message: "Queues cleaned successfully" }; return { success: true, message: "Queues cleaned successfully" };
}), }),
clearDeployments: protectedProcedure
.input(apiFindCompose)
.mutation(async ({ input, ctx }) => {
const compose = await findComposeById(input.composeId);
if (
compose.environment.project.organizationId !==
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
message:
"You are not authorized to clear deployments for this compose",
});
}
await clearOldDeployments(compose.appName, compose.serverId);
return true;
}),
killBuild: protectedProcedure killBuild: protectedProcedure
.input(apiFindCompose) .input(apiFindCompose)
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
@@ -8,6 +8,7 @@ import {
findComposeById, findComposeById,
findDeploymentById, findDeploymentById,
findServerById, findServerById,
removeDeployment,
updateDeploymentStatus, updateDeploymentStatus,
} from "@dokploy/server"; } from "@dokploy/server";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
@@ -107,4 +108,14 @@ export const deploymentRouter = createTRPCRouter({
await updateDeploymentStatus(deployment.deploymentId, "error"); await updateDeploymentStatus(deployment.deploymentId, "error");
}), }),
removeDeployment: protectedProcedure
.input(
z.object({
deploymentId: z.string().min(1),
}),
)
.mutation(async ({ input }) => {
return await removeDeployment(input.deploymentId);
}),
}); });
@@ -8,6 +8,7 @@ import {
createPushoverNotification, createPushoverNotification,
createResendNotification, createResendNotification,
createSlackNotification, createSlackNotification,
createTeamsNotification,
createTelegramNotification, createTelegramNotification,
findNotificationById, findNotificationById,
getWebServerSettings, getWebServerSettings,
@@ -23,6 +24,7 @@ import {
sendResendNotification, sendResendNotification,
sendServerThresholdNotifications, sendServerThresholdNotifications,
sendSlackNotification, sendSlackNotification,
sendTeamsNotification,
sendTelegramNotification, sendTelegramNotification,
updateCustomNotification, updateCustomNotification,
updateDiscordNotification, updateDiscordNotification,
@@ -33,6 +35,7 @@ import {
updatePushoverNotification, updatePushoverNotification,
updateResendNotification, updateResendNotification,
updateSlackNotification, updateSlackNotification,
updateTeamsNotification,
updateTelegramNotification, updateTelegramNotification,
} from "@dokploy/server"; } from "@dokploy/server";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
@@ -55,6 +58,7 @@ import {
apiCreatePushover, apiCreatePushover,
apiCreateResend, apiCreateResend,
apiCreateSlack, apiCreateSlack,
apiCreateTeams,
apiCreateTelegram, apiCreateTelegram,
apiFindOneNotification, apiFindOneNotification,
apiTestCustomConnection, apiTestCustomConnection,
@@ -66,6 +70,7 @@ import {
apiTestPushoverConnection, apiTestPushoverConnection,
apiTestResendConnection, apiTestResendConnection,
apiTestSlackConnection, apiTestSlackConnection,
apiTestTeamsConnection,
apiTestTelegramConnection, apiTestTelegramConnection,
apiUpdateCustom, apiUpdateCustom,
apiUpdateDiscord, apiUpdateDiscord,
@@ -76,6 +81,7 @@ import {
apiUpdatePushover, apiUpdatePushover,
apiUpdateResend, apiUpdateResend,
apiUpdateSlack, apiUpdateSlack,
apiUpdateTeams,
apiUpdateTelegram, apiUpdateTelegram,
notifications, notifications,
server, server,
@@ -413,6 +419,7 @@ export const notificationRouter = createTRPCRouter({
custom: true, custom: true,
lark: true, lark: true,
pushover: true, pushover: true,
teams: true,
}, },
orderBy: desc(notifications.createdAt), orderBy: desc(notifications.createdAt),
where: eq(notifications.organizationId, ctx.session.activeOrganizationId), where: eq(notifications.organizationId, ctx.session.activeOrganizationId),
@@ -705,6 +712,61 @@ export const notificationRouter = createTRPCRouter({
}); });
} }
}), }),
createTeams: adminProcedure
.input(apiCreateTeams)
.mutation(async ({ input, ctx }) => {
try {
return await createTeamsNotification(
input,
ctx.session.activeOrganizationId,
);
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
message: "Error creating the notification",
cause: error,
});
}
}),
updateTeams: adminProcedure
.input(apiUpdateTeams)
.mutation(async ({ input, ctx }) => {
try {
const notification = await findNotificationById(input.notificationId);
if (
IS_CLOUD &&
notification.organizationId !== ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
message: "You are not authorized to update this notification",
});
}
return await updateTeamsNotification({
...input,
organizationId: ctx.session.activeOrganizationId,
});
} catch (error) {
throw error;
}
}),
testTeamsConnection: adminProcedure
.input(apiTestTeamsConnection)
.mutation(async ({ input }) => {
try {
await sendTeamsNotification(input, {
title: "🤚 Test Notification",
facts: [{ name: "Message", value: "Hi, From Dokploy 👋" }],
});
return true;
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
message: `${error instanceof Error ? error.message : "Unknown error"}`,
cause: error,
});
}
}),
createPushover: adminProcedure createPushover: adminProcedure
.input(apiCreatePushover) .input(apiCreatePushover)
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
@@ -55,9 +55,128 @@ export const ssoRouter = createTRPCRouter({
samlConfig: true, samlConfig: true,
organizationId: true, organizationId: true,
}, },
orderBy: [asc(ssoProvider.createdAt)],
}); });
return providers; return providers;
}), }),
one: enterpriseProcedure
.input(z.object({ providerId: z.string().min(1) }))
.query(async ({ ctx, input }) => {
const provider = await db.query.ssoProvider.findFirst({
where: and(
eq(ssoProvider.providerId, input.providerId),
eq(ssoProvider.organizationId, ctx.session.activeOrganizationId),
eq(ssoProvider.userId, ctx.session.userId),
),
columns: {
id: true,
providerId: true,
issuer: true,
domain: true,
oidcConfig: true,
samlConfig: true,
organizationId: true,
},
});
if (!provider) {
throw new TRPCError({
code: "NOT_FOUND",
message:
"SSO provider not found or you do not have permission to access it",
});
}
return provider;
}),
update: enterpriseProcedure
.input(ssoProviderBodySchema)
.mutation(async ({ ctx, input }) => {
const existing = await db.query.ssoProvider.findFirst({
where: and(
eq(ssoProvider.providerId, input.providerId),
eq(ssoProvider.organizationId, ctx.session.activeOrganizationId),
eq(ssoProvider.userId, ctx.session.userId),
),
columns: {
id: true,
issuer: true,
domain: true,
},
});
if (!existing) {
throw new TRPCError({
code: "NOT_FOUND",
message:
"SSO provider not found or you do not have permission to update it",
});
}
const providers = await db.query.ssoProvider.findMany({
where: eq(ssoProvider.organizationId, ctx.session.activeOrganizationId),
columns: { providerId: true, domain: true },
});
for (const provider of providers) {
if (provider.providerId === input.providerId) continue;
const providerDomains = provider.domain
.split(",")
.map((d) => d.trim().toLowerCase());
for (const domain of input.domains) {
if (providerDomains.includes(domain)) {
throw new TRPCError({
code: "BAD_REQUEST",
message: `Domain ${domain} is already registered for another provider`,
});
}
}
}
const issuerChanged =
normalizeTrustedOrigin(existing.issuer) !==
normalizeTrustedOrigin(input.issuer);
if (issuerChanged) {
const currentUser = await db.query.user.findFirst({
where: eq(user.id, ctx.session.userId),
columns: { trustedOrigins: true },
});
const trustedOrigins = currentUser?.trustedOrigins ?? [];
const newOrigin = normalizeTrustedOrigin(input.issuer);
const isInTrustedOrigins = trustedOrigins.some(
(o) => o.toLowerCase() === newOrigin.toLowerCase(),
);
if (!isInTrustedOrigins) {
throw new TRPCError({
code: "BAD_REQUEST",
message:
"The new Issuer URL is not in your trusted origins list. Please add it in Manage origins before saving.",
});
}
}
const domain = input.domains.join(",");
const updateBody: {
issuer: string;
domain: string;
oidcConfig?: (typeof input)["oidcConfig"];
samlConfig?: (typeof input)["samlConfig"];
} = {
issuer: input.issuer,
domain,
};
if (input.oidcConfig != null) {
updateBody.oidcConfig = input.oidcConfig;
}
if (input.samlConfig != null) {
updateBody.samlConfig = input.samlConfig;
}
await auth.updateSSOProvider({
params: { providerId: input.providerId },
body: updateBody,
headers: requestToHeaders(ctx.req),
});
return { success: true };
}),
deleteProvider: enterpriseProcedure deleteProvider: enterpriseProcedure
.input(z.object({ providerId: z.string().min(1) })) .input(z.object({ providerId: z.string().min(1) }))
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
@@ -102,24 +221,6 @@ export const ssoRouter = createTRPCRouter({
}); });
} }
const currentUser = await db.query.user.findFirst({
where: eq(user.id, ctx.session.userId),
columns: {
trustedOrigins: true,
},
});
if (currentUser?.trustedOrigins) {
const issuerOrigin = normalizeTrustedOrigin(providerToDelete.issuer);
const updatedOrigins = currentUser.trustedOrigins.filter(
(origin) => origin.toLowerCase() !== issuerOrigin.toLowerCase(),
);
await db
.update(user)
.set({ trustedOrigins: updatedOrigins })
.where(eq(user.id, ctx.session.userId));
}
return { success: true }; return { success: true };
}), }),
register: enterpriseProcedure register: enterpriseProcedure
@@ -147,25 +248,6 @@ export const ssoRouter = createTRPCRouter({
} }
} }
const domain = input.domains.join(","); const domain = input.domains.join(",");
const currentUser = await db.query.user.findFirst({
where: eq(user.id, ctx.session.userId),
columns: {
trustedOrigins: true,
},
});
const existingOrigins = currentUser?.trustedOrigins || [];
const issuerOrigin = normalizeTrustedOrigin(input.issuer);
const newOrigins = Array.from(
new Set([...existingOrigins, issuerOrigin]),
);
await db
.update(user)
.set({ trustedOrigins: newOrigins })
.where(eq(user.id, ctx.session.userId));
await auth.registerSSOProvider({ await auth.registerSSOProvider({
body: { body: {
@@ -177,4 +259,65 @@ export const ssoRouter = createTRPCRouter({
}); });
return { success: true }; return { success: true };
}), }),
addTrustedOrigin: enterpriseProcedure
.input(z.object({ origin: z.string().min(1) }))
.mutation(async ({ ctx, input }) => {
const normalized = normalizeTrustedOrigin(input.origin);
const currentUser = await db.query.user.findFirst({
where: eq(user.id, ctx.session.userId),
columns: { trustedOrigins: true },
});
const existing = currentUser?.trustedOrigins || [];
if (existing.some((o) => o.toLowerCase() === normalized.toLowerCase())) {
return { success: true };
}
const next = Array.from(new Set([...existing, normalized]));
await db
.update(user)
.set({ trustedOrigins: next })
.where(eq(user.id, ctx.session.userId));
return { success: true };
}),
removeTrustedOrigin: enterpriseProcedure
.input(z.object({ origin: z.string().min(1) }))
.mutation(async ({ ctx, input }) => {
const normalized = normalizeTrustedOrigin(input.origin);
const currentUser = await db.query.user.findFirst({
where: eq(user.id, ctx.session.userId),
columns: { trustedOrigins: true },
});
const existing = currentUser?.trustedOrigins || [];
const next = existing.filter(
(o) => o.toLowerCase() !== normalized.toLowerCase(),
);
await db
.update(user)
.set({ trustedOrigins: next })
.where(eq(user.id, ctx.session.userId));
return { success: true };
}),
updateTrustedOrigin: enterpriseProcedure
.input(
z.object({
oldOrigin: z.string().min(1),
newOrigin: z.string().min(1),
}),
)
.mutation(async ({ ctx, input }) => {
const oldNorm = normalizeTrustedOrigin(input.oldOrigin);
const newNorm = normalizeTrustedOrigin(input.newOrigin);
const currentUser = await db.query.user.findFirst({
where: eq(user.id, ctx.session.userId),
columns: { trustedOrigins: true },
});
const existing = currentUser?.trustedOrigins || [];
const next = existing.map((o) =>
o.toLowerCase() === oldNorm.toLowerCase() ? newNorm : o,
);
await db
.update(user)
.set({ trustedOrigins: next })
.where(eq(user.id, ctx.session.userId));
return { success: true };
}),
}); });
+8 -3
View File
@@ -27,12 +27,17 @@ export const stripeRouter = createTRPCRouter({
const products = await stripe.products.list({ const products = await stripe.products.list({
expand: ["data.default_price"], expand: ["data.default_price"],
active: true, active: true,
ids: [PRODUCT_MONTHLY_ID, PRODUCT_ANNUAL_ID], });
const filteredProducts = products.data.filter((product) => {
return (
product.id === PRODUCT_MONTHLY_ID || product.id === PRODUCT_ANNUAL_ID
);
}); });
if (!stripeCustomerId) { if (!stripeCustomerId) {
return { return {
products: products.data, products: filteredProducts,
subscriptions: [], subscriptions: [],
}; };
} }
@@ -44,7 +49,7 @@ export const stripeRouter = createTRPCRouter({
}); });
return { return {
products: products.data, products: filteredProducts,
subscriptions: subscriptions.data, subscriptions: subscriptions.data,
}; };
}), }),
+1 -2
View File
@@ -39,8 +39,7 @@
"**/*.js", "**/*.js",
".next/types/**/*.ts", ".next/types/**/*.ts",
"env.js", "env.js",
"next.config.mjs", "next.config.mjs"
"next-i18next.config.mjs"
], ],
"exclude": [ "exclude": [
"node_modules", "node_modules",
-16
View File
@@ -1,16 +0,0 @@
import Cookies from "js-cookie";
import type { LanguageCode } from "@/lib/languages";
export default function useLocale() {
const currentLocale = (Cookies.get("DOKPLOY_LOCALE") ?? "en") as LanguageCode;
const setLocale = (locale: LanguageCode) => {
Cookies.set("DOKPLOY_LOCALE", locale, { expires: 365 });
window.location.reload();
};
return {
locale: currentLocale,
setLocale,
};
}
-23
View File
@@ -1,23 +0,0 @@
import type { NextApiRequestCookies } from "next/dist/server/api-utils";
export function getLocale(cookies: NextApiRequestCookies) {
const locale = cookies.DOKPLOY_LOCALE ?? "en";
return locale;
}
import { serverSideTranslations as originalServerSideTranslations } from "next-i18next/serverSideTranslations";
import { Languages } from "@/lib/languages";
export const serverSideTranslations = (
locale: string,
namespaces = ["common"],
) =>
originalServerSideTranslations(locale, namespaces, {
fallbackLng: "en",
keySeparator: false,
i18n: {
defaultLocale: "en",
locales: Object.values(Languages).map((language) => language.code),
localeDetection: false,
},
});
+1 -1
View File
@@ -20,7 +20,7 @@
"pino-pretty": "11.2.2", "pino-pretty": "11.2.2",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"zod": "^3.25.32" "zod": "^3.25.76"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^20.16.0", "@types/node": "^20.16.0",
+5
View File
@@ -43,5 +43,10 @@
"resolutions": { "resolutions": {
"@types/react": "18.3.5", "@types/react": "18.3.5",
"@types/react-dom": "18.3.0" "@types/react-dom": "18.3.0"
},
"pnpm": {
"overrides": {
"esbuild": "0.20.2"
}
} }
} }
+27
View File
@@ -0,0 +1,27 @@
# Debug build OOM – orden para probar
Ejecuta desde `packages/server` (o `pnpm --filter=@dokploy/server run <script>` desde la raíz).
1. **`pnpm run build:debug:noEmit`**
Solo typecheck, no escribe archivos.
- Si hace **OOM** → el problema es el análisis de tipos (ej. zod u otras libs).
- Si **pasa** → el problema está en emit (JS o `.d.ts`).
2. **`pnpm run build:debug:noEmit:8gb`**
Mismo que el anterior pero con 8GB de heap.
- Si con 8GB **pasa** y sin 8GB **no** → el typecheck necesita más memoria.
3. **`pnpm run build:debug:noDecl`**
Compila solo JS (sin `declaration`).
- Si hace **OOM** → el problema es emitir JS.
- Si **pasa** → el problema es generar `.d.ts`.
4. **`pnpm run build:debug:declOnly`**
Solo genera declaraciones (`.d.ts`).
- Si hace **OOM** → el cuello de botella son las declaraciones.
5. **`pnpm run build:debug:full`**
Build completo con `--extendedDiagnostics` (imprime estadísticas al final).
- Para ver en qué paso se va la memoria si no has localizado antes.
Con eso sabes si el OOM viene de: typecheck, emit JS o emit declarations, y puedes elegir fix (más memoria, esbuild para JS, o no emitir declarations).
+12 -12
View File
@@ -30,13 +30,13 @@
"generate:drizzle": "pnpm dlx @better-auth/cli generate --output auth-schema2.ts --config src/lib/auth.ts" "generate:drizzle": "pnpm dlx @better-auth/cli generate --output auth-schema2.ts --config src/lib/auth.ts"
}, },
"dependencies": { "dependencies": {
"@ai-sdk/anthropic": "^2.0.5", "@ai-sdk/anthropic": "^3.0.44",
"@ai-sdk/azure": "^2.0.16", "@ai-sdk/azure": "^3.0.30",
"@ai-sdk/cohere": "^2.0.4", "@ai-sdk/cohere": "^3.0.21",
"@ai-sdk/deepinfra": "^1.0.10", "@ai-sdk/deepinfra": "^2.0.34",
"@ai-sdk/mistral": "^2.0.7", "@ai-sdk/mistral": "^3.0.20",
"@ai-sdk/openai": "^2.0.16", "@ai-sdk/openai": "^3.0.29",
"@ai-sdk/openai-compatible": "^1.0.10", "@ai-sdk/openai-compatible": "^2.0.30",
"@better-auth/utils": "0.3.0", "@better-auth/utils": "0.3.0",
"@faker-js/faker": "^8.4.1", "@faker-js/faker": "^8.4.1",
"@octokit/auth-app": "^6.1.3", "@octokit/auth-app": "^6.1.3",
@@ -44,11 +44,11 @@
"@oslojs/crypto": "1.0.1", "@oslojs/crypto": "1.0.1",
"@oslojs/encoding": "1.1.0", "@oslojs/encoding": "1.1.0",
"@react-email/components": "^0.0.21", "@react-email/components": "^0.0.21",
"@better-auth/sso":"1.4.18", "@better-auth/sso": "1.4.18",
"@trpc/server": "^10.45.2", "@trpc/server": "^10.45.2",
"adm-zip": "^0.5.16", "adm-zip": "^0.5.16",
"ai": "^5.0.17", "ai": "^6.0.86",
"ai-sdk-ollama": "^0.5.1", "ai-sdk-ollama": "^3.7.0",
"bcrypt": "5.1.1", "bcrypt": "5.1.1",
"better-auth": "1.4.18", "better-auth": "1.4.18",
"bl": "6.0.11", "bl": "6.0.11",
@@ -81,11 +81,11 @@
"ssh2": "1.15.0", "ssh2": "1.15.0",
"toml": "3.0.0", "toml": "3.0.0",
"ws": "8.16.0", "ws": "8.16.0",
"zod": "^3.25.32", "zod": "^3.25.76",
"semver": "7.7.3" "semver": "7.7.3"
}, },
"devDependencies": { "devDependencies": {
"@better-auth/cli": "1.4.18", "@better-auth/cli": "1.4.18",
"@types/semver": "7.7.1", "@types/semver": "7.7.1",
"@types/adm-zip": "^0.5.7", "@types/adm-zip": "^0.5.7",
"@types/bcrypt": "5.0.2", "@types/bcrypt": "5.0.2",
@@ -126,7 +126,6 @@ const schema = createInsertSchema(deployments, {
previewDeploymentId: z.string(), previewDeploymentId: z.string(),
buildServerId: z.string(), buildServerId: z.string(),
}); });
export const apiCreateDeployment = schema export const apiCreateDeployment = schema
.pick({ .pick({
title: true, title: true,
@@ -23,6 +23,7 @@ export const notificationType = pgEnum("notificationType", [
"pushover", "pushover",
"custom", "custom",
"lark", "lark",
"teams",
]); ]);
export const notifications = pgTable("notification", { export const notifications = pgTable("notification", {
@@ -72,6 +73,9 @@ export const notifications = pgTable("notification", {
pushoverId: text("pushoverId").references(() => pushover.pushoverId, { pushoverId: text("pushoverId").references(() => pushover.pushoverId, {
onDelete: "cascade", onDelete: "cascade",
}), }),
teamsId: text("teamsId").references(() => teams.teamsId, {
onDelete: "cascade",
}),
organizationId: text("organizationId") organizationId: text("organizationId")
.notNull() .notNull()
.references(() => organization.id, { onDelete: "cascade" }), .references(() => organization.id, { onDelete: "cascade" }),
@@ -179,6 +183,14 @@ export const pushover = pgTable("pushover", {
expire: integer("expire"), expire: integer("expire"),
}); });
export const teams = pgTable("teams", {
teamsId: text("teamsId")
.notNull()
.primaryKey()
.$defaultFn(() => nanoid()),
webhookUrl: text("webhookUrl").notNull(),
});
export const notificationsRelations = relations(notifications, ({ one }) => ({ export const notificationsRelations = relations(notifications, ({ one }) => ({
slack: one(slack, { slack: one(slack, {
fields: [notifications.slackId], fields: [notifications.slackId],
@@ -220,6 +232,10 @@ export const notificationsRelations = relations(notifications, ({ one }) => ({
fields: [notifications.pushoverId], fields: [notifications.pushoverId],
references: [pushover.pushoverId], references: [pushover.pushoverId],
}), }),
teams: one(teams, {
fields: [notifications.teamsId],
references: [teams.teamsId],
}),
organization: one(organization, { organization: one(organization, {
fields: [notifications.organizationId], fields: [notifications.organizationId],
references: [organization.id], references: [organization.id],
@@ -507,6 +523,32 @@ export const apiTestLarkConnection = apiCreateLark.pick({
webhookUrl: true, webhookUrl: true,
}); });
export const apiCreateTeams = notificationsSchema
.pick({
appBuildError: true,
databaseBackup: true,
volumeBackup: true,
dokployRestart: true,
name: true,
appDeploy: true,
dockerCleanup: true,
serverThreshold: true,
})
.extend({
webhookUrl: z.string().min(1),
})
.required();
export const apiUpdateTeams = apiCreateTeams.partial().extend({
notificationId: z.string().min(1),
teamsId: z.string().min(1),
organizationId: z.string().optional(),
});
export const apiTestTeamsConnection = apiCreateTeams.pick({
webhookUrl: true,
});
export const apiCreatePushover = notificationsSchema export const apiCreatePushover = notificationsSchema
.pick({ .pick({
appBuildError: true, appBuildError: true,
+2 -1
View File
@@ -1,5 +1,5 @@
import { relations } from "drizzle-orm"; import { relations } from "drizzle-orm";
import { pgTable, text } from "drizzle-orm/pg-core"; import { pgTable, text, timestamp } from "drizzle-orm/pg-core";
import { z } from "zod"; import { z } from "zod";
import { organization } from "./account"; import { organization } from "./account";
import { user } from "./user"; import { user } from "./user";
@@ -15,6 +15,7 @@ export const ssoProvider = pgTable("sso_provider", {
onDelete: "cascade", onDelete: "cascade",
}), }),
domain: text("domain").notNull(), domain: text("domain").notNull(),
createdAt: timestamp("created_at").notNull().defaultNow(),
}); });
export const ssoProviderRelations = relations(ssoProvider, ({ one }) => ({ export const ssoProviderRelations = relations(ssoProvider, ({ one }) => ({
+11 -11
View File
@@ -18,6 +18,8 @@ import { getHubSpotUTK, submitToHubSpot } from "../utils/tracking/hubspot";
import { sendEmail } from "../verification/send-verification-email"; import { sendEmail } from "../verification/send-verification-email";
import { getPublicIpWithFallback } from "../wss/utils"; import { getPublicIpWithFallback } from "../wss/utils";
const trustedProviders = process.env?.TRUSTED_PROVIDERS?.split(",") || [];
const { handler, api } = betterAuth({ const { handler, api } = betterAuth({
database: drizzleAdapter(db, { database: drizzleAdapter(db, {
provider: "pg", provider: "pg",
@@ -43,17 +45,14 @@ const { handler, api } = betterAuth({
}, },
} }
: {}), : {}),
...(IS_CLOUD
? { account: {
account: { accountLinking: {
accountLinking: { enabled: true,
enabled: true, trustedProviders: ["github", "google", ...(trustedProviders || [])],
trustedProviders: ["github", "google"], allowDifferentEmails: true,
allowDifferentEmails: true, },
}, },
},
}
: {}),
appName: "Dokploy", appName: "Dokploy",
socialProviders: { socialProviders: {
github: { github: {
@@ -348,6 +347,7 @@ export const auth = {
handler, handler,
createApiKey: api.createApiKey, createApiKey: api.createApiKey,
registerSSOProvider: api.registerSSOProvider, registerSSOProvider: api.registerSSOProvider,
updateSSOProvider: api.updateSSOProvider,
}; };
export const validateRequest = async (request: IncomingMessage) => { export const validateRequest = async (request: IncomingMessage) => {
+172 -150
View File
@@ -2,13 +2,31 @@ import { db } from "@dokploy/server/db";
import { ai } from "@dokploy/server/db/schema"; import { ai } from "@dokploy/server/db/schema";
import { selectAIProvider } from "@dokploy/server/utils/ai/select-ai-provider"; import { selectAIProvider } from "@dokploy/server/utils/ai/select-ai-provider";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { generateObject } from "ai"; import { generateText, Output } from "ai";
import { desc, eq } from "drizzle-orm"; import { desc, eq } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
import { IS_CLOUD } from "../constants"; import { IS_CLOUD } from "../constants";
import { findServerById } from "./server"; import { findServerById } from "./server";
import { getWebServerSettings } from "./web-server-settings"; import { getWebServerSettings } from "./web-server-settings";
interface SuggestionItem {
id: string;
name: string;
shortDescription: string;
description: string;
}
interface SuggestionsOutput {
suggestions: SuggestionItem[];
}
interface DockerOutput {
dockerCompose: string;
envVariables: Array<{ name: string; value: string }>;
domains: Array<{ host: string; port: number; serviceName: string }>;
configFiles?: Array<{ content: string; filePath: string }>;
}
export const getAiSettingsByOrganizationId = async (organizationId: string) => { export const getAiSettingsByOrganizationId = async (organizationId: string) => {
const aiSettings = await db.query.ai.findMany({ const aiSettings = await db.query.ai.findMany({
where: eq(ai.organizationId, organizationId), where: eq(ai.organizationId, organizationId),
@@ -60,7 +78,7 @@ interface Props {
} }
export const suggestVariants = async ({ export const suggestVariants = async ({
organizationId, organizationId: _organizationId,
aiId, aiId,
input, input,
serverId, serverId,
@@ -90,173 +108,177 @@ export const suggestVariants = async ({
ip = "127.0.0.1"; ip = "127.0.0.1";
} }
const { object } = await generateObject({ const suggestionsSchema = z.object({
model, suggestions: z.array(
output: "object", z.object({
schema: z.object({ id: z.string(),
suggestions: z.array( name: z.string(),
z.object({ shortDescription: z.string(),
id: z.string(), description: z.string(),
name: z.string(), }),
shortDescription: z.string(), ),
description: z.string(),
}),
),
}),
prompt: `
Act as advanced DevOps engineer and analyze the user's request to determine the appropriate suggestions (up to 3 items).
CRITICAL - Read the user's request carefully and follow the appropriate strategy:
Strategy A - If the user specifies a PARTICULAR APPLICATION/SERVICE (e.g., "deploy Chatwoot", "install sendingtk/chatwoot:develop", "setup Bitwarden"):
- Generate different deployment VARIANTS of that SAME application
- Each variant should be a different configuration (minimal, full stack, with different databases, development vs production, etc.)
- Example: For "Chatwoot" → "Chatwoot with PostgreSQL", "Chatwoot Development", "Chatwoot Full Stack"
- The name MUST include the specific application name the user mentioned
Strategy B - If the user describes a GENERAL NEED or USE CASE (e.g., "personal blog", "project management tool", "chat application"):
- Suggest different open source projects that fulfill that need
- Each suggestion should be a different tool/platform that solves the same problem
- Example: For "personal blog" → "WordPress", "Ghost", "Hugo with Nginx"
- The name should be the actual project name
Return your response as a JSON object with the following structure:
{
"suggestions": [
{
"id": "project-or-variant-slug",
"name": "Project Name or Variant Name",
"shortDescription": "Brief one-line description",
"description": "Detailed description"
}
]
}
Important rules for the response:
1. Use slug format for the id field (lowercase, hyphenated)
2. Determine which strategy to use based on whether the user specified a particular application or described a general need
3. For Strategy A (specific app): The name must include the app name and describe the variant configuration
4. For Strategy B (general need): The name should be the actual project/tool name that fulfills the need
5. The description field should ONLY contain a plain text description of the project or variant, its features, and use cases
6. Do NOT include any code snippets, configuration examples, or installation instructions in the description
7. The shortDescription should be a single-line summary focusing on key technologies or differentiators
8. All suggestions should be installable in docker and have docker compose support
9. Provide variety in your suggestions - different complexity levels, tech stacks, or approaches
User wants to create a new project with the following details:
${input}
`,
}); });
const suggestionsResult = await generateText({
model,
// @ts-ignore - Zod + AI SDK Output.object() causes excessively deep instantiation
output: Output.object({ schema: suggestionsSchema }),
prompt: `
Act as advanced DevOps engineer and analyze the user's request to determine the appropriate suggestions (up to 3 items).
CRITICAL - Read the user's request carefully and follow the appropriate strategy:
Strategy A - If the user specifies a PARTICULAR APPLICATION/SERVICE (e.g., "deploy Chatwoot", "install sendingtk/chatwoot:develop", "setup Bitwarden"):
- Generate different deployment VARIANTS of that SAME application
- Each variant should be a different configuration (minimal, full stack, with different databases, development vs production, etc.)
- Example: For "Chatwoot" → "Chatwoot with PostgreSQL", "Chatwoot Development", "Chatwoot Full Stack"
- The name MUST include the specific application name the user mentioned
Strategy B - If the user describes a GENERAL NEED or USE CASE (e.g., "personal blog", "project management tool", "chat application"):
- Suggest different open source projects that fulfill that need
- Each suggestion should be a different tool/platform that solves the same problem
- Example: For "personal blog" → "WordPress", "Ghost", "Hugo with Nginx"
- The name should be the actual project name
Return your response as a JSON object with the following structure:
{
"suggestions": [
{
"id": "project-or-variant-slug",
"name": "Project Name or Variant Name",
"shortDescription": "Brief one-line description",
"description": "Detailed description"
}
]
}
Important rules for the response:
1. Use slug format for the id field (lowercase, hyphenated)
2. Determine which strategy to use based on whether the user specified a particular application or described a general need
3. For Strategy A (specific app): The name must include the app name and describe the variant configuration
4. For Strategy B (general need): The name should be the actual project/tool name that fulfills the need
5. The description field should ONLY contain a plain text description of the project or variant, its features, and use cases
6. Do NOT include any code snippets, configuration examples, or installation instructions in the description
7. The shortDescription should be a single-line summary focusing on key technologies or differentiators
8. All suggestions should be installable in docker and have docker compose support
9. Provide variety in your suggestions - different complexity levels, tech stacks, or approaches
User wants to create a new project with the following details:
${input}
`,
});
const object = suggestionsResult.output as SuggestionsOutput | undefined;
if (object?.suggestions?.length) { if (object?.suggestions?.length) {
const dockerSchema = z.object({
dockerCompose: z.string(),
envVariables: z.array(
z.object({
name: z.string(),
value: z.string(),
}),
),
domains: z.array(
z.object({
host: z.string(),
port: z.number(),
serviceName: z.string(),
}),
),
configFiles: z
.array(
z.object({
content: z.string(),
filePath: z.string(),
}),
)
.optional(),
});
const result = []; const result = [];
for (const suggestion of object.suggestions) { for (const suggestion of object.suggestions) {
try { try {
const { object: docker } = await generateObject({ const dockerResult = await generateText({
model, model,
output: "object", // @ts-ignore - Zod + AI SDK Output.object() causes excessively deep instantiation
schema: z.object({ output: Output.object({ schema: dockerSchema }),
dockerCompose: z.string(),
envVariables: z.array(
z.object({
name: z.string(),
value: z.string(),
}),
),
domains: z.array(
z.object({
host: z.string(),
port: z.number(),
serviceName: z.string(),
}),
),
configFiles: z
.array(
z.object({
content: z.string(),
filePath: z.string(),
}),
)
.optional(),
}),
prompt: ` prompt: `
Act as advanced DevOps engineer and generate docker compose with environment variables and domain configurations needed to install the following project. Act as advanced DevOps engineer and generate docker compose with environment variables and domain configurations needed to install the following project.
Return your response as a JSON object with this structure: Return your response as a JSON object with this structure:
{ {
"dockerCompose": "yaml string here", "dockerCompose": "yaml string here",
"envVariables": [{"name": "VAR_NAME", "value": "example_value"}], "envVariables": [{"name": "VAR_NAME", "value": "example_value"}],
"domains": [{"host": "domain.com", "port": 3000, "serviceName": "service"}], "domains": [{"host": "domain.com", "port": 3000, "serviceName": "service"}],
"configFiles": [{"content": "file content", "filePath": "path/to/file"}] "configFiles": [{"content": "file content", "filePath": "path/to/file"}]
} }
Note: configFiles is optional - only include it if configuration files are absolutely required. Note: configFiles is optional - only include it if configuration files are absolutely required.
Follow these rules: Follow these rules:
Docker Compose Rules: Docker Compose Rules:
1. Use placeholder like \${VARIABLE_NAME-default} for generated variables in the docker-compose.yml 1. Use placeholder like \${VARIABLE_NAME-default} for generated variables in the docker-compose.yml
2. Use complex values for passwords/secrets variables 2. Use complex values for passwords/secrets variables
3. Don't set container_name field in services 3. Don't set container_name field in services
4. Don't set version field in the docker compose 4. Don't set version field in the docker compose
5. Don't set ports like 'ports: 3000:3000', use 'ports: "3000"' instead 5. Don't set ports like 'ports: 3000:3000', use 'ports: "3000"' instead
6. If a service depends on a database or other service, INCLUDE that service in the docker-compose 6. If a service depends on a database or other service, INCLUDE that service in the docker-compose
7. Make sure all required services are defined in the docker-compose 7. Make sure all required services are defined in the docker-compose
Docker Image Rules (CRITICAL): Docker Image Rules (CRITICAL):
1. ALWAYS use 'image:' field, NEVER use 'build:' field 1. ALWAYS use 'image:' field, NEVER use 'build:' field
2. NEVER use 'build: .' or any build directive - we don't have local Dockerfiles 2. NEVER use 'build: .' or any build directive - we don't have local Dockerfiles
3. Use images from Docker Hub or other public registries (e.g., docker.io, ghcr.io, quay.io) 3. Use images from Docker Hub or other public registries (e.g., docker.io, ghcr.io, quay.io)
4. For dependencies (databases, redis, etc.), use official images (e.g., postgres:16, redis:7, etc.) 4. For dependencies (databases, redis, etc.), use official images (e.g., postgres:16, redis:7, etc.)
5. Always specify image tags - avoid using 'latest' tag, use specific versions when possible 5. Always specify image tags - avoid using 'latest' tag, use specific versions when possible
6. Examples of correct image usage: 6. Examples of correct image usage:
- image: sendingtk/chatwoot:develop - image: sendingtk/chatwoot:develop
- image: postgres:16-alpine - image: postgres:16-alpine
- image: redis:7-alpine - image: redis:7-alpine
- image: chatwoot/chatwoot:latest - image: chatwoot/chatwoot:latest
7. Examples of INCORRECT usage (DO NOT USE): 7. Examples of INCORRECT usage (DO NOT USE):
- build: . - build: .
- build: ./app - build: ./app
- build: - build:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
Volume Mounting and Configuration Rules: Volume Mounting and Configuration Rules:
1. DO NOT create configuration files unless the service CANNOT work without them 1. DO NOT create configuration files unless the service CANNOT work without them
2. Most services can work with just environment variables - USE THEM FIRST 2. Most services can work with just environment variables - USE THEM FIRST
3. Ask yourself: "Can this be configured with an environment variable instead?" 3. Ask yourself: "Can this be configured with an environment variable instead?"
4. If and ONLY IF a config file is absolutely required: 4. If and ONLY IF a config file is absolutely required:
- Keep it minimal with only critical settings - Keep it minimal with only critical settings
- Use "../files/" prefix for all mounts - Use "../files/" prefix for all mounts
- Format: "../files/folder:/container/path" - Format: "../files/folder:/container/path"
5. DO NOT add configuration files for: 5. DO NOT add configuration files for:
- Default configurations that work out of the box - Default configurations that work out of the box
- Settings that can be handled by environment variables - Settings that can be handled by environment variables
- Proxy or routing configurations (these are handled elsewhere) - Proxy or routing configurations (these are handled elsewhere)
Environment Variables Rules: Environment Variables Rules:
1. For the envVariables array, provide ACTUAL example values, not placeholders 1. For the envVariables array, provide ACTUAL example values, not placeholders
2. Use realistic example values (e.g., "[email protected]" for emails, "mypassword123" for passwords) 2. Use realistic example values (e.g., "[email protected]" for emails, "mypassword123" for passwords)
3. DO NOT use \${VARIABLE_NAME-default} syntax in the envVariables values 3. DO NOT use \${VARIABLE_NAME-default} syntax in the envVariables values
4. ONLY include environment variables that are actually used in the docker-compose 4. ONLY include environment variables that are actually used in the docker-compose
5. Every environment variable referenced in the docker-compose MUST have a corresponding entry in envVariables 5. Every environment variable referenced in the docker-compose MUST have a corresponding entry in envVariables
6. Do not include environment variables for services that don't exist in the docker-compose 6. Do not include environment variables for services that don't exist in the docker-compose
For each service that needs to be exposed to the internet: For each service that needs to be exposed to the internet:
1. Define a domain configuration with: 1. Define a domain configuration with:
- host: the domain name for the service in format: {service-name}-{random-3-chars-hex}-${ip ? ip.replaceAll(".", "-") : ""}.traefik.me - host: the domain name for the service in format: {service-name}-{random-3-chars-hex}-${ip ? ip.replaceAll(".", "-") : ""}.traefik.me
- port: the internal port the service runs on - port: the internal port the service runs on
- serviceName: the name of the service in the docker-compose - serviceName: the name of the service in the docker-compose
2. Make sure the service is properly configured to work with the specified port 2. Make sure the service is properly configured to work with the specified port
User's original request: ${input} User's original request: ${input}
Project details: Project details:
${suggestion?.description} ${suggestion?.description}
`, `,
}); });
if (!!docker && !!docker.dockerCompose) { const docker = dockerResult.output as DockerOutput | undefined;
if (docker?.dockerCompose) {
result.push({ result.push({
...suggestion, ...suggestion,
...docker, ...docker,
+2 -4
View File
@@ -419,16 +419,14 @@ export const removeCompose = async (
if (compose.composeType === "stack") { if (compose.composeType === "stack") {
const command = ` const command = `
docker network disconnect ${compose.appName} dokploy-traefik; docker network disconnect ${compose.appName} dokploy-traefik;
cd ${projectPath} && docker stack rm ${compose.appName} && rm -rf ${projectPath}`; docker stack rm ${compose.appName};
rm -rf ${projectPath}`;
if (compose.serverId) { if (compose.serverId) {
await execAsyncRemote(compose.serverId, command); await execAsyncRemote(compose.serverId, command);
} else { } else {
await execAsync(command); await execAsync(command);
} }
await execAsync(command, {
cwd: projectPath,
});
} else { } else {
const command = ` const command = `
docker network disconnect ${compose.appName} dokploy-traefik; docker network disconnect ${compose.appName} dokploy-traefik;
+39 -3
View File
@@ -13,7 +13,10 @@ import {
deployments, deployments,
} from "@dokploy/server/db/schema"; } from "@dokploy/server/db/schema";
import { removeDirectoryIfExistsContent } from "@dokploy/server/utils/filesystem/directory"; import { removeDirectoryIfExistsContent } from "@dokploy/server/utils/filesystem/directory";
import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync"; import {
execAsync,
execAsyncRemote,
} from "@dokploy/server/utils/process/execAsync";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { format } from "date-fns"; import { format } from "date-fns";
import { desc, eq } from "drizzle-orm"; import { desc, eq } from "drizzle-orm";
@@ -554,8 +557,25 @@ export const removeDeployment = async (deploymentId: string) => {
const deployment = await db const deployment = await db
.delete(deployments) .delete(deployments)
.where(eq(deployments.deploymentId, deploymentId)) .where(eq(deployments.deploymentId, deploymentId))
.returning(); .returning()
return deployment[0]; .then((result) => result[0]);
if (!deployment) {
throw new TRPCError({
code: "BAD_REQUEST",
message: "Deployment not found",
});
}
const command = `
rm -f ${deployment.logPath};
`;
if (deployment.serverId) {
await execAsyncRemote(deployment.serverId, command);
} else {
await execAsync(command);
}
return deployment;
} catch (error) { } catch (error) {
const message = const message =
error instanceof Error ? error.message : "Error creating the deployment"; error instanceof Error ? error.message : "Error creating the deployment";
@@ -831,3 +851,19 @@ export const findAllDeploymentsByServerId = async (serverId: string) => {
}); });
return deploymentsList; return deploymentsList;
}; };
export const clearOldDeployments = async (
appName: string,
serverId: string | null,
) => {
const { LOGS_PATH } = paths(!!serverId);
const folder = path.join(LOGS_PATH, appName);
const command = `
rm -rf ${folder};
`;
if (serverId) {
await execAsyncRemote(serverId, command);
} else {
await execAsync(command);
}
};
@@ -101,6 +101,20 @@ export const findEnvironmentsByProjectId = async (projectId: string) => {
return projectEnvironments; return projectEnvironments;
}; };
const environmentHasServices = (
env: Awaited<ReturnType<typeof findEnvironmentById>>,
) => {
return (
(env.applications?.length ?? 0) > 0 ||
(env.compose?.length ?? 0) > 0 ||
(env.mariadb?.length ?? 0) > 0 ||
(env.mongo?.length ?? 0) > 0 ||
(env.mysql?.length ?? 0) > 0 ||
(env.postgres?.length ?? 0) > 0 ||
(env.redis?.length ?? 0) > 0
);
};
export const deleteEnvironment = async (environmentId: string) => { export const deleteEnvironment = async (environmentId: string) => {
const currentEnvironment = await findEnvironmentById(environmentId); const currentEnvironment = await findEnvironmentById(environmentId);
if (currentEnvironment.isDefault) { if (currentEnvironment.isDefault) {
@@ -109,6 +123,13 @@ export const deleteEnvironment = async (environmentId: string) => {
message: "You cannot delete the default environment", message: "You cannot delete the default environment",
}); });
} }
if (environmentHasServices(currentEnvironment)) {
throw new TRPCError({
code: "BAD_REQUEST",
message:
"Cannot delete environment: it has active services. Delete all services first.",
});
}
const deletedEnvironment = await db const deletedEnvironment = await db
.delete(environments) .delete(environments)
.where(eq(environments.environmentId, environmentId)) .where(eq(environments.environmentId, environmentId))
@@ -9,6 +9,7 @@ import {
type apiCreatePushover, type apiCreatePushover,
type apiCreateResend, type apiCreateResend,
type apiCreateSlack, type apiCreateSlack,
type apiCreateTeams,
type apiCreateTelegram, type apiCreateTelegram,
type apiUpdateCustom, type apiUpdateCustom,
type apiUpdateDiscord, type apiUpdateDiscord,
@@ -19,6 +20,7 @@ import {
type apiUpdatePushover, type apiUpdatePushover,
type apiUpdateResend, type apiUpdateResend,
type apiUpdateSlack, type apiUpdateSlack,
type apiUpdateTeams,
type apiUpdateTelegram, type apiUpdateTelegram,
custom, custom,
discord, discord,
@@ -30,6 +32,7 @@ import {
pushover, pushover,
resend, resend,
slack, slack,
teams,
telegram, telegram,
} from "@dokploy/server/db/schema"; } from "@dokploy/server/db/schema";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
@@ -796,6 +799,7 @@ export const findNotificationById = async (notificationId: string) => {
custom: true, custom: true,
lark: true, lark: true,
pushover: true, pushover: true,
teams: true,
}, },
}); });
if (!notification) { if (!notification) {
@@ -905,6 +909,96 @@ export const updateLarkNotification = async (
}); });
}; };
export const createTeamsNotification = async (
input: typeof apiCreateTeams._type,
organizationId: string,
) => {
await db.transaction(async (tx) => {
const newTeams = await tx
.insert(teams)
.values({
webhookUrl: input.webhookUrl,
})
.returning()
.then((value) => value[0]);
if (!newTeams) {
throw new TRPCError({
code: "BAD_REQUEST",
message: "Error input: Inserting teams",
});
}
const newDestination = await tx
.insert(notifications)
.values({
teamsId: newTeams.teamsId,
name: input.name,
appDeploy: input.appDeploy,
appBuildError: input.appBuildError,
databaseBackup: input.databaseBackup,
volumeBackup: input.volumeBackup,
dokployRestart: input.dokployRestart,
dockerCleanup: input.dockerCleanup,
notificationType: "teams",
organizationId: organizationId,
serverThreshold: input.serverThreshold,
})
.returning()
.then((value) => value[0]);
if (!newDestination) {
throw new TRPCError({
code: "BAD_REQUEST",
message: "Error input: Inserting notification",
});
}
return newDestination;
});
};
export const updateTeamsNotification = async (
input: typeof apiUpdateTeams._type,
) => {
await db.transaction(async (tx) => {
const newDestination = await tx
.update(notifications)
.set({
name: input.name,
appDeploy: input.appDeploy,
appBuildError: input.appBuildError,
databaseBackup: input.databaseBackup,
volumeBackup: input.volumeBackup,
dokployRestart: input.dokployRestart,
dockerCleanup: input.dockerCleanup,
organizationId: input.organizationId,
serverThreshold: input.serverThreshold,
})
.where(eq(notifications.notificationId, input.notificationId))
.returning()
.then((value) => value[0]);
if (!newDestination) {
throw new TRPCError({
code: "BAD_REQUEST",
message: "Error Updating notification",
});
}
await tx
.update(teams)
.set({
webhookUrl: input.webhookUrl,
})
.where(eq(teams.teamsId, input.teamsId))
.returning()
.then((value) => value[0]);
return newDestination;
});
};
export const updateNotificationById = async ( export const updateNotificationById = async (
notificationId: string, notificationId: string,
notificationData: Partial<Notification>, notificationData: Partial<Notification>,
@@ -88,7 +88,7 @@ export const createCommand = (compose: ComposeNested) => {
let command = ""; let command = "";
if (composeType === "docker-compose") { if (composeType === "docker-compose") {
command = `compose -p ${appName} -f ${path} up -d --build --pull always --remove-orphans`; command = `compose -p ${appName} -f ${path} up -d --build --remove-orphans`;
} else if (composeType === "stack") { } else if (composeType === "stack") {
command = `stack deploy -c ${path} ${appName} --prune --with-registry-auth`; command = `stack deploy -c ${path} ${appName} --prune --with-registry-auth`;
} }
+4 -2
View File
@@ -164,10 +164,12 @@ export const addDomainToCompose = async (
for (const domain of domains) { for (const domain of domains) {
const { serviceName, https } = domain; const { serviceName, https } = domain;
if (!serviceName) { if (!serviceName) {
throw new Error("Service name not found"); throw new Error(`Domain "${domain.host}" is missing a service name`);
} }
if (!result?.services?.[serviceName]) { if (!result?.services?.[serviceName]) {
throw new Error(`The service ${serviceName} not found in the compose`); throw new Error(
`Domain "${domain.host}" is attached to service "${serviceName}" which does not exist in the compose`,
);
} }
const httpLabels = createDomainLabels(appName, domain, "web"); const httpLabels = createDomainLabels(appName, domain, "web");
@@ -14,6 +14,7 @@ import {
sendPushoverNotification, sendPushoverNotification,
sendResendNotification, sendResendNotification,
sendSlackNotification, sendSlackNotification,
sendTeamsNotification,
sendTelegramNotification, sendTelegramNotification,
} from "./utils"; } from "./utils";
@@ -52,6 +53,7 @@ export const sendBuildErrorNotifications = async ({
custom: true, custom: true,
lark: true, lark: true,
pushover: true, pushover: true,
teams: true,
}, },
}); });
@@ -67,6 +69,7 @@ export const sendBuildErrorNotifications = async ({
custom, custom,
lark, lark,
pushover, pushover,
teams,
} = notification; } = notification;
try { try {
if (email || resend) { if (email || resend) {
@@ -382,6 +385,26 @@ export const sendBuildErrorNotifications = async ({
`Project: ${projectName}\nApplication: ${applicationName}\nType: ${applicationType}\nDate: ${date.toLocaleString()}\nError: ${errorMessage}`, `Project: ${projectName}\nApplication: ${applicationName}\nType: ${applicationType}\nDate: ${date.toLocaleString()}\nError: ${errorMessage}`,
); );
} }
if (teams) {
const limitCharacter = 800;
const truncatedErrorMessage = errorMessage.substring(0, limitCharacter);
await sendTeamsNotification(teams, {
title: "⚠️ Build Failed",
facts: [
{ name: "Project", value: projectName },
{ name: "Application", value: applicationName },
{ name: "Type", value: applicationType },
{ name: "Date", value: format(date, "PP pp") },
{ name: "Error Message", value: truncatedErrorMessage },
],
potentialAction: {
type: "Action.OpenUrl",
title: "View Build Details",
url: buildLink,
},
});
}
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
@@ -15,6 +15,7 @@ import {
sendPushoverNotification, sendPushoverNotification,
sendResendNotification, sendResendNotification,
sendSlackNotification, sendSlackNotification,
sendTeamsNotification,
sendTelegramNotification, sendTelegramNotification,
} from "./utils"; } from "./utils";
@@ -55,6 +56,7 @@ export const sendBuildSuccessNotifications = async ({
custom: true, custom: true,
lark: true, lark: true,
pushover: true, pushover: true,
teams: true,
}, },
}); });
@@ -70,6 +72,7 @@ export const sendBuildSuccessNotifications = async ({
custom, custom,
lark, lark,
pushover, pushover,
teams,
} = notification; } = notification;
try { try {
if (email || resend) { if (email || resend) {
@@ -396,6 +399,24 @@ export const sendBuildSuccessNotifications = async ({
`Project: ${projectName}\nApplication: ${applicationName}\nEnvironment: ${environmentName}\nType: ${applicationType}\nDate: ${date.toLocaleString()}`, `Project: ${projectName}\nApplication: ${applicationName}\nEnvironment: ${environmentName}\nType: ${applicationType}\nDate: ${date.toLocaleString()}`,
); );
} }
if (teams) {
await sendTeamsNotification(teams, {
title: "✅ Build Success",
facts: [
{ name: "Project", value: projectName },
{ name: "Application", value: applicationName },
{ name: "Environment", value: environmentName },
{ name: "Type", value: applicationType },
{ name: "Date", value: format(date, "PP pp") },
],
potentialAction: {
type: "Action.OpenUrl",
title: "View Build Details",
url: buildLink,
},
});
}
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
@@ -14,6 +14,7 @@ import {
sendPushoverNotification, sendPushoverNotification,
sendResendNotification, sendResendNotification,
sendSlackNotification, sendSlackNotification,
sendTeamsNotification,
sendTelegramNotification, sendTelegramNotification,
} from "./utils"; } from "./utils";
@@ -52,6 +53,7 @@ export const sendDatabaseBackupNotifications = async ({
custom: true, custom: true,
lark: true, lark: true,
pushover: true, pushover: true,
teams: true,
}, },
}); });
@@ -67,6 +69,7 @@ export const sendDatabaseBackupNotifications = async ({
custom, custom,
lark, lark,
pushover, pushover,
teams,
} = notification; } = notification;
try { try {
if (email || resend) { if (email || resend) {
@@ -410,6 +413,30 @@ export const sendDatabaseBackupNotifications = async ({
`Project: ${projectName}\nApplication: ${applicationName}\nDatabase: ${databaseType}\nDatabase Name: ${databaseName}\nDate: ${date.toLocaleString()}${type === "error" && errorMessage ? `\nError: ${errorMessage}` : ""}`, `Project: ${projectName}\nApplication: ${applicationName}\nDatabase: ${databaseType}\nDatabase Name: ${databaseName}\nDate: ${date.toLocaleString()}${type === "error" && errorMessage ? `\nError: ${errorMessage}` : ""}`,
); );
} }
if (teams) {
const facts = [
{ name: "Project", value: projectName },
{ name: "Application", value: applicationName },
{ name: "Database Type", value: databaseType },
{ name: "Database Name", value: databaseName },
{ name: "Date", value: format(date, "PP pp") },
{
name: "Status",
value: type === "success" ? "Successful" : "Failed",
},
];
if (type === "error" && errorMessage) {
facts.push({ name: "Error", value: errorMessage.substring(0, 500) });
}
await sendTeamsNotification(teams, {
title:
type === "success"
? "✅ Database Backup Successful"
: "❌ Database Backup Failed",
facts,
});
}
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
@@ -14,6 +14,7 @@ import {
sendPushoverNotification, sendPushoverNotification,
sendResendNotification, sendResendNotification,
sendSlackNotification, sendSlackNotification,
sendTeamsNotification,
sendTelegramNotification, sendTelegramNotification,
} from "./utils"; } from "./utils";
@@ -39,6 +40,7 @@ export const sendDockerCleanupNotifications = async (
custom: true, custom: true,
lark: true, lark: true,
pushover: true, pushover: true,
teams: true,
}, },
}); });
@@ -54,6 +56,7 @@ export const sendDockerCleanupNotifications = async (
custom, custom,
lark, lark,
pushover, pushover,
teams,
} = notification; } = notification;
try { try {
if (email || resend) { if (email || resend) {
@@ -262,6 +265,16 @@ export const sendDockerCleanupNotifications = async (
`Date: ${date.toLocaleString()}\nMessage: ${message}`, `Date: ${date.toLocaleString()}\nMessage: ${message}`,
); );
} }
if (teams) {
await sendTeamsNotification(teams, {
title: "✅ Docker Cleanup",
facts: [
{ name: "Date", value: format(date, "PP pp") },
{ name: "Message", value: message },
],
});
}
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
@@ -14,6 +14,7 @@ import {
sendPushoverNotification, sendPushoverNotification,
sendResendNotification, sendResendNotification,
sendSlackNotification, sendSlackNotification,
sendTeamsNotification,
sendTelegramNotification, sendTelegramNotification,
} from "./utils"; } from "./utils";
@@ -33,6 +34,7 @@ export const sendDokployRestartNotifications = async () => {
custom: true, custom: true,
lark: true, lark: true,
pushover: true, pushover: true,
teams: true,
}, },
}); });
@@ -48,6 +50,7 @@ export const sendDokployRestartNotifications = async () => {
custom, custom,
lark, lark,
pushover, pushover,
teams,
} = notification; } = notification;
try { try {
@@ -251,6 +254,16 @@ export const sendDokployRestartNotifications = async () => {
`Date: ${date.toLocaleString()}`, `Date: ${date.toLocaleString()}`,
); );
} }
if (teams) {
await sendTeamsNotification(teams, {
title: "✅ Dokploy Server Restarted",
facts: [
{ name: "Status", value: "Successful" },
{ name: "Restart Time", value: format(date, "PP pp") },
],
});
}
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
@@ -7,6 +7,7 @@ import {
sendLarkNotification, sendLarkNotification,
sendPushoverNotification, sendPushoverNotification,
sendSlackNotification, sendSlackNotification,
sendTeamsNotification,
sendTelegramNotification, sendTelegramNotification,
} from "./utils"; } from "./utils";
@@ -40,6 +41,7 @@ export const sendServerThresholdNotifications = async (
custom: true, custom: true,
lark: true, lark: true,
pushover: true, pushover: true,
teams: true,
}, },
}); });
@@ -47,7 +49,8 @@ export const sendServerThresholdNotifications = async (
const typeColor = 0xff0000; // Rojo para indicar alerta const typeColor = 0xff0000; // Rojo para indicar alerta
for (const notification of notificationList) { for (const notification of notificationList) {
const { discord, telegram, slack, custom, lark, pushover } = notification; const { discord, telegram, slack, custom, lark, pushover, teams } =
notification;
if (discord) { if (discord) {
const decorate = (decoration: string, text: string) => const decorate = (decoration: string, text: string) =>
@@ -276,5 +279,19 @@ export const sendServerThresholdNotifications = async (
`Server: ${payload.ServerName}\nType: ${payload.Type}\nCurrent: ${payload.Value.toFixed(2)}%\nThreshold: ${payload.Threshold.toFixed(2)}%\nMessage: ${payload.Message}\nTime: ${date.toLocaleString()}`, `Server: ${payload.ServerName}\nType: ${payload.Type}\nCurrent: ${payload.Value.toFixed(2)}%\nThreshold: ${payload.Threshold.toFixed(2)}%\nMessage: ${payload.Message}\nTime: ${date.toLocaleString()}`,
); );
} }
if (teams) {
await sendTeamsNotification(teams, {
title: `⚠️ Server ${payload.Type} Alert`,
facts: [
{ name: "Server Name", value: payload.ServerName },
{ name: "Type", value: payload.Type },
{ name: "Current Value", value: `${payload.Value.toFixed(2)}%` },
{ name: "Threshold", value: `${payload.Threshold.toFixed(2)}%` },
{ name: "Time", value: date.toLocaleString() },
{ name: "Message", value: payload.Message },
],
});
}
} }
}; };
@@ -8,6 +8,7 @@ import type {
pushover, pushover,
resend, resend,
slack, slack,
teams,
telegram, telegram,
} from "@dokploy/server/db/schema"; } from "@dokploy/server/db/schema";
import nodemailer from "nodemailer"; import nodemailer from "nodemailer";
@@ -253,6 +254,84 @@ export const sendLarkNotification = async (
} }
}; };
export interface TeamsAdaptiveCardMessage {
title: string;
themeColor?: string;
facts?: { name: string; value: string }[];
potentialAction?: { type: "Action.OpenUrl"; title: string; url: string };
}
export const sendTeamsNotification = async (
connection: typeof teams.$inferInsert,
message: TeamsAdaptiveCardMessage,
) => {
try {
const bodyElements: Record<string, unknown>[] = [
{
type: "TextBlock",
text: message.title,
size: "Medium",
weight: "Bolder",
wrap: true,
},
];
if (message.facts && message.facts.length > 0) {
bodyElements.push({
type: "FactSet",
facts: message.facts.map((f) => ({
title: f.name,
value: f.value,
})),
});
}
const cardContent: Record<string, unknown> = {
type: "AdaptiveCard",
$schema: "http://adaptivecards.io/schemas/adaptive-card.json",
version: "1.4",
body: bodyElements,
};
if (message.potentialAction) {
cardContent.actions = [
{
type: "Action.OpenUrl",
title: message.potentialAction.title,
url: message.potentialAction.url,
},
];
}
const payload = {
type: "message",
attachments: [
{
contentType: "application/vnd.microsoft.card.adaptive",
content: cardContent,
},
],
};
const response = await fetch(connection.webhookUrl, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify(payload),
});
if (!response.ok) {
throw new Error(
`Failed to send Teams notification: ${response.statusText}`,
);
}
} catch (err) {
console.log(err);
throw new Error(
`Failed to send Teams notification ${err instanceof Error ? err.message : "Unknown error"}`,
);
}
};
export const sendPushoverNotification = async ( export const sendPushoverNotification = async (
connection: typeof pushover.$inferInsert, connection: typeof pushover.$inferInsert,
title: string, title: string,
@@ -12,6 +12,7 @@ import {
sendPushoverNotification, sendPushoverNotification,
sendResendNotification, sendResendNotification,
sendSlackNotification, sendSlackNotification,
sendTeamsNotification,
sendTelegramNotification, sendTelegramNotification,
} from "./utils"; } from "./utils";
@@ -57,12 +58,22 @@ export const sendVolumeBackupNotifications = async ({
gotify: true, gotify: true,
ntfy: true, ntfy: true,
pushover: true, pushover: true,
teams: true,
}, },
}); });
for (const notification of notificationList) { for (const notification of notificationList) {
const { email, resend, discord, telegram, slack, gotify, ntfy, pushover } = const {
notification; email,
resend,
discord,
telegram,
slack,
gotify,
ntfy,
pushover,
teams,
} = notification;
if (email || resend) { if (email || resend) {
const subject = `Volume Backup ${type === "success" ? "Successful" : "Failed"} - ${applicationName}`; const subject = `Volume Backup ${type === "success" ? "Successful" : "Failed"} - ${applicationName}`;
@@ -288,5 +299,29 @@ export const sendVolumeBackupNotifications = async ({
`Project: ${projectName}\nApplication: ${applicationName}\nVolume: ${volumeName}\nService Type: ${serviceType}${backupSize ? `\nBackup Size: ${backupSize}` : ""}\nDate: ${date.toLocaleString()}${type === "error" && errorMessage ? `\nError: ${errorMessage}` : ""}`, `Project: ${projectName}\nApplication: ${applicationName}\nVolume: ${volumeName}\nService Type: ${serviceType}${backupSize ? `\nBackup Size: ${backupSize}` : ""}\nDate: ${date.toLocaleString()}${type === "error" && errorMessage ? `\nError: ${errorMessage}` : ""}`,
); );
} }
if (teams) {
const facts = [
{ name: "Project", value: projectName },
{ name: "Application", value: applicationName },
{ name: "Volume Name", value: volumeName },
{ name: "Service Type", value: serviceType },
{ name: "Date", value: format(date, "PP pp") },
{ name: "Status", value: type === "success" ? "Successful" : "Failed" },
];
if (backupSize) {
facts.push({ name: "Backup Size", value: backupSize });
}
if (type === "error" && errorMessage) {
facts.push({ name: "Error", value: errorMessage.substring(0, 500) });
}
await sendTeamsNotification(teams, {
title:
type === "success"
? "✅ Volume Backup Successful"
: "❌ Volume Backup Failed",
facts,
});
}
} }
}; };
+16 -1
View File
@@ -104,6 +104,20 @@ export const removeDomain = async (
} }
}; };
/**
* Converts an internationalized domain name (IDN) to ASCII punycode format.
* Traefik requires domain names in ASCII format, so non-ASCII characters
* must be converted (e.g., "тест.рф" → "xn--e1aybc.xn--p1ai").
*/
const toPunycode = (host: string): string => {
try {
return new URL(`http://${host}`).hostname;
} catch {
// If URL parsing fails, return the original host
return host;
}
};
export const createRouterConfig = async ( export const createRouterConfig = async (
app: ApplicationNested, app: ApplicationNested,
domain: Domain, domain: Domain,
@@ -114,8 +128,9 @@ export const createRouterConfig = async (
const { host, path, https, uniqueConfigKey, internalPath, stripPath } = const { host, path, https, uniqueConfigKey, internalPath, stripPath } =
domain; domain;
const punycodeHost = toPunycode(host);
const routerConfig: HttpRouter = { const routerConfig: HttpRouter = {
rule: `Host(\`${host}\`)${path !== null && path !== "/" ? ` && PathPrefix(\`${path}\`)` : ""}`, rule: `Host(\`${punycodeHost}\`)${path !== null && path !== "/" ? ` && PathPrefix(\`${path}\`)` : ""}`,
service: `${appName}-service-${uniqueConfigKey}`, service: `${appName}-service-${uniqueConfigKey}`,
middlewares: [], middlewares: [],
entryPoints: [entryPoint], entryPoints: [entryPoint],
+1
View File
@@ -34,6 +34,7 @@
"dokploy", "dokploy",
"config", "config",
"dist", "dist",
".next",
"webpack.config.server.js", "webpack.config.server.js",
"migration.ts", "migration.ts",
"setup.ts" "setup.ts"
@@ -0,0 +1,7 @@
{
"extends": "./tsconfig.server.json",
"compilerOptions": {
"declaration": false,
"declarationMap": false
}
}
+2200 -3120
View File
File diff suppressed because it is too large Load Diff