mirror of
https://github.com/andwati/dokploy.git
synced 2026-10-18 03:02:56 +00:00
[autofix.ci] apply automated fixes
This commit is contained in:
@@ -65,7 +65,13 @@ import { ScheduleFormField } from "../../application/schedules/handle-schedules"
|
|||||||
|
|
||||||
type CacheType = "cache" | "fetch";
|
type CacheType = "cache" | "fetch";
|
||||||
|
|
||||||
type DatabaseType = "postgres" | "mariadb" | "mysql" | "mongo" | "web-server" | "libsql";
|
type DatabaseType =
|
||||||
|
| "postgres"
|
||||||
|
| "mariadb"
|
||||||
|
| "mysql"
|
||||||
|
| "mongo"
|
||||||
|
| "web-server"
|
||||||
|
| "libsql";
|
||||||
|
|
||||||
const Schema = z
|
const Schema = z
|
||||||
.object({
|
.object({
|
||||||
@@ -209,7 +215,12 @@ export const HandleBackup = ({
|
|||||||
|
|
||||||
const form = useForm({
|
const form = useForm({
|
||||||
defaultValues: {
|
defaultValues: {
|
||||||
database: databaseType === "web-server" ? "dokploy" : databaseType === "libsql" ? "iku.db" : "",
|
database:
|
||||||
|
databaseType === "web-server"
|
||||||
|
? "dokploy"
|
||||||
|
: databaseType === "libsql"
|
||||||
|
? "iku.db"
|
||||||
|
: "",
|
||||||
destinationId: "",
|
destinationId: "",
|
||||||
enabled: true,
|
enabled: true,
|
||||||
prefix: "/",
|
prefix: "/",
|
||||||
@@ -284,14 +295,14 @@ export const HandleBackup = ({
|
|||||||
mongoId: id,
|
mongoId: id,
|
||||||
}
|
}
|
||||||
: databaseType === "libsql"
|
: databaseType === "libsql"
|
||||||
? {
|
|
||||||
libsqlId: id,
|
|
||||||
}
|
|
||||||
: databaseType === "web-server"
|
|
||||||
? {
|
? {
|
||||||
userId: id,
|
libsqlId: id,
|
||||||
}
|
}
|
||||||
: undefined;
|
: databaseType === "web-server"
|
||||||
|
? {
|
||||||
|
userId: id,
|
||||||
|
}
|
||||||
|
: undefined;
|
||||||
|
|
||||||
await createBackup({
|
await createBackup({
|
||||||
destinationId: data.destinationId,
|
destinationId: data.destinationId,
|
||||||
|
|||||||
@@ -39,9 +39,7 @@ import { RestoreBackup } from "./restore-backup";
|
|||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
id: string;
|
id: string;
|
||||||
databaseType?:
|
databaseType?: Exclude<ServiceType, "application" | "redis"> | "web-server";
|
||||||
| Exclude<ServiceType, "application" | "redis">
|
|
||||||
| "web-server";
|
|
||||||
backupType?: "database" | "compose";
|
backupType?: "database" | "compose";
|
||||||
}
|
}
|
||||||
export const ShowBackups = ({
|
export const ShowBackups = ({
|
||||||
|
|||||||
@@ -76,12 +76,9 @@ export const backups = pgTable("backup", {
|
|||||||
mongoId: text("mongoId").references((): AnyPgColumn => mongo.mongoId, {
|
mongoId: text("mongoId").references((): AnyPgColumn => mongo.mongoId, {
|
||||||
onDelete: "cascade",
|
onDelete: "cascade",
|
||||||
}),
|
}),
|
||||||
libsqlId: text("libsqlId").references(
|
libsqlId: text("libsqlId").references((): AnyPgColumn => libsql.libsqlId, {
|
||||||
(): AnyPgColumn => libsql.libsqlId,
|
onDelete: "cascade",
|
||||||
{
|
}),
|
||||||
onDelete: "cascade",
|
|
||||||
},
|
|
||||||
),
|
|
||||||
userId: text("userId").references(() => user.id),
|
userId: text("userId").references(() => user.id),
|
||||||
// Only for compose backups
|
// Only for compose backups
|
||||||
metadata: jsonb("metadata").$type<
|
metadata: jsonb("metadata").$type<
|
||||||
@@ -149,7 +146,14 @@ const createSchema = createInsertSchema(backups, {
|
|||||||
database: z.string().min(1),
|
database: z.string().min(1),
|
||||||
schedule: z.string(),
|
schedule: z.string(),
|
||||||
keepLatestCount: z.number().optional(),
|
keepLatestCount: z.number().optional(),
|
||||||
databaseType: z.enum(["postgres", "mariadb", "mysql", "mongo", "web-server", "libsql"]),
|
databaseType: z.enum([
|
||||||
|
"postgres",
|
||||||
|
"mariadb",
|
||||||
|
"mysql",
|
||||||
|
"mongo",
|
||||||
|
"web-server",
|
||||||
|
"libsql",
|
||||||
|
]),
|
||||||
postgresId: z.string().optional(),
|
postgresId: z.string().optional(),
|
||||||
mariadbId: z.string().optional(),
|
mariadbId: z.string().optional(),
|
||||||
mysqlId: z.string().optional(),
|
mysqlId: z.string().optional(),
|
||||||
@@ -206,7 +210,14 @@ export const apiUpdateBackup = createSchema
|
|||||||
|
|
||||||
export const apiRestoreBackup = z.object({
|
export const apiRestoreBackup = z.object({
|
||||||
databaseId: z.string(),
|
databaseId: z.string(),
|
||||||
databaseType: z.enum(["postgres", "mysql", "mariadb", "mongo", "web-server", "libsql"]),
|
databaseType: z.enum([
|
||||||
|
"postgres",
|
||||||
|
"mysql",
|
||||||
|
"mariadb",
|
||||||
|
"mongo",
|
||||||
|
"web-server",
|
||||||
|
"libsql",
|
||||||
|
]),
|
||||||
backupType: z.enum(["database", "compose"]),
|
backupType: z.enum(["database", "compose"]),
|
||||||
databaseName: z.string().min(1),
|
databaseName: z.string().min(1),
|
||||||
backupFile: z.string().min(1),
|
backupFile: z.string().min(1),
|
||||||
|
|||||||
@@ -107,7 +107,9 @@ const createSchema = createInsertSchema(libsql, {
|
|||||||
sqldNode: z.enum(sqldNode.enumValues),
|
sqldNode: z.enum(sqldNode.enumValues),
|
||||||
sqldPrimaryUrl: z.string().nullable(),
|
sqldPrimaryUrl: z.string().nullable(),
|
||||||
enableNamespaces: z.boolean().default(false),
|
enableNamespaces: z.boolean().default(false),
|
||||||
dockerImage: z.string().default("ghcr.io/tursodatabase/libsql-server:v0.24.32"),
|
dockerImage: z
|
||||||
|
.string()
|
||||||
|
.default("ghcr.io/tursodatabase/libsql-server:v0.24.32"),
|
||||||
command: z.string().optional(),
|
command: z.string().optional(),
|
||||||
env: z.string().optional(),
|
env: z.string().optional(),
|
||||||
memoryReservation: z.string().optional(),
|
memoryReservation: z.string().optional(),
|
||||||
|
|||||||
@@ -132,12 +132,24 @@ export const getComposeContainerCommand = (
|
|||||||
};
|
};
|
||||||
|
|
||||||
const getContainerSearchCommand = (backup: BackupSchedule) => {
|
const getContainerSearchCommand = (backup: BackupSchedule) => {
|
||||||
const { backupType, postgres, mysql, mariadb, mongo, libsql, compose, serviceName } =
|
const {
|
||||||
backup;
|
backupType,
|
||||||
|
postgres,
|
||||||
|
mysql,
|
||||||
|
mariadb,
|
||||||
|
mongo,
|
||||||
|
libsql,
|
||||||
|
compose,
|
||||||
|
serviceName,
|
||||||
|
} = backup;
|
||||||
|
|
||||||
if (backupType === "database") {
|
if (backupType === "database") {
|
||||||
const appName =
|
const appName =
|
||||||
postgres?.appName || mysql?.appName || mariadb?.appName || mongo?.appName || libsql?.appName;
|
postgres?.appName ||
|
||||||
|
mysql?.appName ||
|
||||||
|
mariadb?.appName ||
|
||||||
|
mongo?.appName ||
|
||||||
|
libsql?.appName;
|
||||||
return getServiceContainerCommand(appName || "");
|
return getServiceContainerCommand(appName || "");
|
||||||
}
|
}
|
||||||
if (backupType === "compose") {
|
if (backupType === "compose") {
|
||||||
|
|||||||
@@ -62,7 +62,11 @@ export const restoreComposeBackup = async (
|
|||||||
const restoreCommand = getRestoreCommand({
|
const restoreCommand = getRestoreCommand({
|
||||||
appName: appName,
|
appName: appName,
|
||||||
serviceName: backupInput.metadata?.serviceName,
|
serviceName: backupInput.metadata?.serviceName,
|
||||||
type: backupInput.databaseType as "postgres" | "mariadb" | "mysql" | "mongo",
|
type: backupInput.databaseType as
|
||||||
|
| "postgres"
|
||||||
|
| "mariadb"
|
||||||
|
| "mysql"
|
||||||
|
| "mongo",
|
||||||
credentials: {
|
credentials: {
|
||||||
database: backupInput.databaseName,
|
database: backupInput.databaseName,
|
||||||
...credentials,
|
...credentials,
|
||||||
|
|||||||
@@ -41,9 +41,7 @@ export const restoreLibsqlBackup = async (
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
emit(
|
emit(
|
||||||
`Error: ${
|
`Error: ${
|
||||||
error instanceof Error
|
error instanceof Error ? error.message : "Error restoring libsql backup"
|
||||||
? error.message
|
|
||||||
: "Error restoring libsql backup"
|
|
||||||
}`,
|
}`,
|
||||||
);
|
);
|
||||||
throw error;
|
throw error;
|
||||||
|
|||||||
Reference in New Issue
Block a user