Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-06-15 20:25:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(libsql): introduce libsql service schema and update related tables

Browse Source 
- Created a new SQL type for 'libsql' and added it to the serviceType enum.
- Established a 'libsql' table with necessary fields and constraints.
- Updated existing tables (backup, mount, volume_backup) to include foreign key references to 'libsql'.
- Adjusted the mount schema to incorporate 'libsql' as a valid service type, enhancing service management capabilities.
This commit is contained in:
Mauricio Siu
2026-03-23 16:14:37 -06:00
parent 116e9d85b7
commit 4b6f2c84ac
10 changed files with 143 additions and 8266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/dokploy/drizzle/0153_even_morlocks.sql → apps/dokploy/drizzle/0153_green_boomerang.sql
View File

@@ -1,4 +1,6 @@
CREATE TYPE "public"."sqldNode" AS ENUM('primary', 'replica');--> statement-breakpoint
ALTER TYPE "public"."databaseType" ADD VALUE 'libsql';--> statement-breakpoint
ALTER TYPE "public"."serviceType" ADD VALUE 'libsql';--> statement-breakpoint
CREATE TABLE "libsql" (
"libsqlId" text PRIMARY KEY NOT NULL,
"name" text NOT NULL,
@@ -9,8 +11,6 @@ CREATE TABLE "libsql" (
"sqldNode" "sqldNode" DEFAULT 'primary' NOT NULL,
"sqldPrimaryUrl" text,
"enableNamespaces" boolean DEFAULT false NOT NULL,
"enableBottomlessReplication" boolean DEFAULT false NOT NULL,
"bottomlessReplicationDestinationId" text,
"dockerImage" text NOT NULL,
"command" text,
"env" text,
@@ -37,13 +37,11 @@ CREATE TABLE "libsql" (
CONSTRAINT "libsql_appName_unique" UNIQUE("appName")
);
--> statement-breakpoint
ALTER TABLE "backup" ADD COLUMN "libsqlId" text;--> statement-breakpoint
ALTER TABLE "mount" ADD COLUMN "libsqlId" text;--> statement-breakpoint
ALTER TABLE "volume_backup" ADD COLUMN "libsqlId" text;--> statement-breakpoint
ALTER TABLE "libsql" ADD CONSTRAINT "libsql_bottomlessReplicationDestinationId_destination_destinationId_fk" FOREIGN KEY ("bottomlessReplicationDestinationId") REFERENCES "public"."destination"("destinationId") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "libsql" ADD CONSTRAINT "libsql_environmentId_environment_environmentId_fk" FOREIGN KEY ("environmentId") REFERENCES "public"."environment"("environmentId") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "libsql" ADD CONSTRAINT "libsql_serverId_server_serverId_fk" FOREIGN KEY ("serverId") REFERENCES "public"."server"("serverId") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "backup" ADD CONSTRAINT "backup_libsqlId_libsql_libsqlId_fk" FOREIGN KEY ("libsqlId") REFERENCES "public"."libsql"("libsqlId") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "mount" ADD CONSTRAINT "mount_libsqlId_libsql_libsqlId_fk" FOREIGN KEY ("libsqlId") REFERENCES "public"."libsql"("libsqlId") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "volume_backup" ADD CONSTRAINT "volume_backup_libsqlId_libsql_libsqlId_fk" FOREIGN KEY ("libsqlId") REFERENCES "public"."libsql"("libsqlId") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "mount" DROP COLUMN "serviceType";--> statement-breakpoint
ALTER TABLE "volume_backup" DROP COLUMN "serviceType";--> statement-breakpoint
DROP TYPE "public"."serviceType";
ALTER TABLE "volume_backup" ADD CONSTRAINT "volume_backup_libsqlId_libsql_libsqlId_fk" FOREIGN KEY ("libsqlId") REFERENCES "public"."libsql"("libsqlId") ON DELETE cascade ON UPDATE no action;

7
apps/dokploy/drizzle/0154_tan_living_mummy.sql
View File

@@ -1,7 +0,0 @@
ALTER TYPE "public"."databaseType" ADD VALUE 'libsql';--> statement-breakpoint
ALTER TABLE "libsql" DROP CONSTRAINT "libsql_bottomlessReplicationDestinationId_destination_destinationId_fk";
--> statement-breakpoint
ALTER TABLE "backup" ADD COLUMN "libsqlId" text;--> statement-breakpoint
ALTER TABLE "backup" ADD CONSTRAINT "backup_libsqlId_libsql_libsqlId_fk" FOREIGN KEY ("libsqlId") REFERENCES "public"."libsql"("libsqlId") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "libsql" DROP COLUMN "enableBottomlessReplication";--> statement-breakpoint
ALTER TABLE "libsql" DROP COLUMN "bottomlessReplicationDestinationId";

80
apps/dokploy/drizzle/meta/0153_snapshot.json
View File

@@ -1,5 +1,5 @@
{
"id": "f040f17d-3acf-42ce-b49a-ae4c0d4b7300",
"id": "72bb48c9-d724-458b-bd91-3ae50e9afe0f",
"prevId": "68c71185-6e91-4b8d-8f91-795457e75ab2",
"version": "7",
"dialect": "postgresql",
@@ -1961,6 +1961,12 @@
"primaryKey": false,
"notNull": false
},
"libsqlId": {
"name": "libsqlId",
"type": "text",
"primaryKey": false,
"notNull": false
},
"userId": {
"name": "userId",
"type": "text",
@@ -2054,6 +2060,19 @@
"onDelete": "cascade",
"onUpdate": "no action"
},
"backup_libsqlId_libsql_libsqlId_fk": {
"name": "backup_libsqlId_libsql_libsqlId_fk",
"tableFrom": "backup",
"tableTo": "libsql",
"columnsFrom": [
"libsqlId"
],
"columnsTo": [
"libsqlId"
],
"onDelete": "cascade",
"onUpdate": "no action"
},
"backup_userId_user_id_fk": {
"name": "backup_userId_user_id_fk",
"tableFrom": "backup",
@@ -3624,19 +3643,6 @@
"notNull": true,
"default": false
},
"enableBottomlessReplication": {
"name": "enableBottomlessReplication",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": false
},
"bottomlessReplicationDestinationId": {
"name": "bottomlessReplicationDestinationId",
"type": "text",
"primaryKey": false,
"notNull": false
},
"dockerImage": {
"name": "dockerImage",
"type": "text",
@@ -3781,19 +3787,6 @@
},
"indexes": {},
"foreignKeys": {
"libsql_bottomlessReplicationDestinationId_destination_destinationId_fk": {
"name": "libsql_bottomlessReplicationDestinationId_destination_destinationId_fk",
"tableFrom": "libsql",
"tableTo": "destination",
"columnsFrom": [
"bottomlessReplicationDestinationId"
],
"columnsTo": [
"destinationId"
],
"onDelete": "set null",
"onUpdate": "no action"
},
"libsql_environmentId_environment_environmentId_fk": {
"name": "libsql_environmentId_environment_environmentId_fk",
"tableFrom": "libsql",
@@ -4369,6 +4362,14 @@
"primaryKey": false,
"notNull": false
},
"serviceType": {
"name": "serviceType",
"type": "serviceType",
"typeSchema": "public",
"primaryKey": false,
"notNull": true,
"default": "'application'"
},
"mountPath": {
"name": "mountPath",
"type": "text",
@@ -7562,6 +7563,14 @@
"primaryKey": false,
"notNull": true
},
"serviceType": {
"name": "serviceType",
"type": "serviceType",
"typeSchema": "public",
"primaryKey": false,
"notNull": true,
"default": "'application'"
},
"appName": {
"name": "appName",
"type": "text",
@@ -7950,7 +7959,8 @@
"mariadb",
"mysql",
"mongo",
"web-server"
"web-server",
"libsql"
]
},
"public.composeType": {
@@ -8011,6 +8021,20 @@
"file"
]
},
"public.serviceType": {
"name": "serviceType",
"schema": "public",
"values": [
"application",
"postgres",
"mysql",
"mariadb",
"mongo",
"redis",
"compose",
"libsql"
]
},
"public.notificationType": {
"name": "notificationType",
"schema": "public",

8138
apps/dokploy/drizzle/meta/0154_snapshot.json
View File

File diff suppressed because it is too large Load Diff

11
apps/dokploy/drizzle/meta/_journal.json
View File

@@ -1076,15 +1076,8 @@
{
"idx": 153,
"version": "7",
"when": 1773940853496,
"tag": "0153_even_morlocks",
"breakpoints": true
},
{
"idx": 154,
"version": "7",
"when": 1773942481550,
"tag": "0154_tan_living_mummy",
"when": 1774303955927,
"tag": "0153_green_boomerang",
"breakpoints": true
}
]

8
apps/dokploy/server/api/routers/mount.ts
View File

@@ -3,6 +3,7 @@ import {
deleteMount,
findApplicationById,
findComposeById,
findLibsqlById,
findMariadbById,
findMongoById,
findMountById,
@@ -13,7 +14,7 @@ import {
getServiceContainer,
updateMount,
} from "@dokploy/server";
import type { ServiceType } from "@dokploy/server/services/mount";
import type { ServiceType } from "@dokploy/server/db/schema/mount";
import {
checkServiceAccess,
checkServicePermissionAndAccess,
@@ -63,6 +64,10 @@ async function getServiceOrganizationId(
const compose = await findComposeById(serviceId);
return compose?.environment?.project?.organizationId ?? null;
}
case "libsql": {
const libsql = await findLibsqlById(serviceId);
return libsql?.environment?.project?.organizationId ?? null;
}
default:
return null;
}
@@ -169,7 +174,6 @@ export const mountRouter = createTRPCRouter({
listByServiceId: protectedProcedure
.input(apiFindMountByApplicationId)
.query(async ({ input, ctx }) => {
console.log("input", input);
await checkServiceAccess(ctx, input.serviceId, "read");
const organizationId = await getServiceOrganizationId(
input.serviceId,

56
packages/server/src/db/schema/mount.ts
View File

@@ -12,6 +12,19 @@ import { mysql } from "./mysql";
import { postgres } from "./postgres";
import { redis } from "./redis";
export const serviceType = pgEnum("serviceType", [
"application",
"postgres",
"mysql",
"mariadb",
"mongo",
"redis",
"compose",
"libsql",
]);
export type ServiceType = (typeof serviceType.enumValues)[number];
export const mountType = pgEnum("mountType", ["bind", "volume", "file"]);
export const mounts = pgTable("mount", {
@@ -24,6 +37,7 @@ export const mounts = pgTable("mount", {
volumeName: text("volumeName"),
filePath: text("filePath"),
content: text("content"),
serviceType: serviceType("serviceType").notNull().default("application"),
mountPath: text("mountPath").notNull(),
applicationId: text("applicationId").references(
() => applications.applicationId,
@@ -96,6 +110,16 @@ const createSchema = createInsertSchema(mounts, {
mountPath: z.string().min(1),
mountId: z.string().optional(),
filePath: z.string().optional(),
serviceType: z.enum([
"application",
"postgres",
"mysql",
"mariadb",
"mongo",
"redis",
"compose",
"libsql",
]),
});
export const apiCreateMount = createSchema
@@ -106,19 +130,10 @@ export const apiCreateMount = createSchema
content: true,
mountPath: true,
filePath: true,
serviceType: true,
})
.extend({
serviceId: z.string().min(1),
serviceType: z.enum([
"application",
"postgres",
"mysql",
"mariadb",
"mongo",
"redis",
"compose",
"libsql",
]),
});
export const apiFindOneMount = z.object({
@@ -134,19 +149,14 @@ export const apiRemoveMount = createSchema
// })
.required();
export const apiFindMountByApplicationId = z.object({
serviceId: z.string().min(1),
serviceType: z.enum([
"application",
"postgres",
"mysql",
"mariadb",
"mongo",
"redis",
"compose",
"libsql",
]),
});
export const apiFindMountByApplicationId = createSchema
.pick({
serviceType: true,
})
.required()
.extend({
serviceId: z.string().min(1),
});
export const apiUpdateMount = createSchema.partial().extend({
mountId: z.string().min(1),

2
packages/server/src/db/schema/volume-backups.ts
View File

@@ -1,5 +1,6 @@
import { relations } from "drizzle-orm";
import { boolean, integer, pgTable, text } from "drizzle-orm/pg-core";
import { serviceType } from "./mount";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid";
import { z } from "zod";
@@ -23,6 +24,7 @@ export const volumeBackups = pgTable("volume_backup", {
name: text("name").notNull(),
volumeName: text("volumeName").notNull(),
prefix: text("prefix").notNull(),
serviceType: serviceType("serviceType").notNull().default("application"),
appName: text("appName")
.notNull()
.$defaultFn(() => generateAppName("volumeBackup")),

93
packages/server/src/services/mount.ts
View File

@@ -4,6 +4,7 @@ import { db } from "@dokploy/server/db";
import {
type apiCreateMount,
mounts,
type ServiceType,
} from "@dokploy/server/db/schema";
import {
createFile,
@@ -19,16 +20,6 @@ import { TRPCError } from "@trpc/server";
import { eq, type SQL, sql } from "drizzle-orm";
import type { z } from "zod";
export type ServiceType =
| "application"
| "compose"
| "libsql"
| "mariadb"
| "mongo"
| "mysql"
| "postgres"
| "redis";
export type Mount = typeof mounts.$inferSelect;
export const createMount = async (input: z.infer<typeof apiCreateMount>) => {
@@ -361,38 +352,38 @@ export const getBaseFilesPath = async (mountId: string) => {
let appName = "";
let directoryPath = "";
if (mount.applicationId && mount.application) {
if (mount.serviceType === "application" && mount.application) {
const { APPLICATIONS_PATH } = paths(!!mount.application.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.application.appName;
} else if (mount.composeId && mount.compose) {
const { COMPOSE_PATH } = paths(!!mount.compose.serverId);
appName = mount.compose.appName;
absoluteBasePath = path.resolve(COMPOSE_PATH);
} else if (mount.libsqlId && mount.libsql) {
const { APPLICATIONS_PATH } = paths(!!mount.libsql.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.libsql.appName;
} else if (mount.mariadbId && mount.mariadb) {
const { APPLICATIONS_PATH } = paths(!!mount.mariadb.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.mariadb.appName;
} else if (mount.mongoId && mount.mongo) {
const { APPLICATIONS_PATH } = paths(!!mount.mongo.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.mongo.appName;
} else if (mount.mysqlId && mount.mysql) {
const { APPLICATIONS_PATH } = paths(!!mount.mysql.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.mysql.appName;
} else if (mount.postgresId && mount.postgres) {
} else if (mount.serviceType === "postgres" && mount.postgres) {
const { APPLICATIONS_PATH } = paths(!!mount.postgres.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.postgres.appName;
} else if (mount.redisId && mount.redis) {
} else if (mount.serviceType === "mariadb" && mount.mariadb) {
const { APPLICATIONS_PATH } = paths(!!mount.mariadb.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.mariadb.appName;
} else if (mount.serviceType === "mongo" && mount.mongo) {
const { APPLICATIONS_PATH } = paths(!!mount.mongo.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.mongo.appName;
} else if (mount.serviceType === "mysql" && mount.mysql) {
const { APPLICATIONS_PATH } = paths(!!mount.mysql.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.mysql.appName;
} else if (mount.serviceType === "redis" && mount.redis) {
const { APPLICATIONS_PATH } = paths(!!mount.redis.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.redis.appName;
} else if (mount.serviceType === "compose" && mount.compose) {
const { COMPOSE_PATH } = paths(!!mount.compose.serverId);
appName = mount.compose.appName;
absoluteBasePath = path.resolve(COMPOSE_PATH);
} else if (mount.serviceType === "libsql" && mount.libsql) {
const { APPLICATIONS_PATH } = paths(!!mount.libsql.serverId);
absoluteBasePath = path.resolve(APPLICATIONS_PATH);
appName = mount.libsql.appName;
}
directoryPath = path.join(absoluteBasePath, appName, "files");
@@ -401,30 +392,30 @@ export const getBaseFilesPath = async (mountId: string) => {
type MountNested = Awaited<ReturnType<typeof findMountById>>;
export const getServerId = async (mount: MountNested) => {
if (mount.applicationId && mount?.application?.serverId) {
if (mount.serviceType === "application" && mount?.application?.serverId) {
return mount.application.serverId;
}
if (mount.composeId && mount?.compose?.serverId) {
return mount.compose.serverId;
}
if (mount.libsqlId && mount?.libsql?.serverId) {
return mount.libsql.serverId;
}
if (mount.mariadbId && mount?.mariadb?.serverId) {
return mount.mariadb.serverId;
}
if (mount.mongoId && mount?.mongo?.serverId) {
return mount.mongo.serverId;
}
if (mount.mysqlId && mount?.mysql?.serverId) {
return mount.mysql.serverId;
}
if (mount.postgresId && mount?.postgres?.serverId) {
if (mount.serviceType === "postgres" && mount?.postgres?.serverId) {
return mount.postgres.serverId;
}
if (mount.redisId && mount?.redis?.serverId) {
if (mount.serviceType === "mariadb" && mount?.mariadb?.serverId) {
return mount.mariadb.serverId;
}
if (mount.serviceType === "mongo" && mount?.mongo?.serverId) {
return mount.mongo.serverId;
}
if (mount.serviceType === "mysql" && mount?.mysql?.serverId) {
return mount.mysql.serverId;
}
if (mount.serviceType === "redis" && mount?.redis?.serverId) {
return mount.redis.serverId;
}
if (mount.serviceType === "compose" && mount?.compose?.serverId) {
return mount.compose.serverId;
}
if (mount.serviceType === "libsql" && mount?.libsql?.serverId) {
return mount.libsql.serverId;
}
return null;
};

2
packages/server/src/utils/restore/compose.ts
View File

@@ -32,7 +32,7 @@ export const restoreComposeBackup = async (
rcloneCommand = `rclone copy ${rcloneFlags.join(" ")} "${backupPath}"`;
}
let credentials: DatabaseCredentials;
let credentials: DatabaseCredentials = {};
switch (backupInput.databaseType) {
case "postgres":