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

Merge branch 'canary' into feat/introduce-monitoring-self-hosted-pay

Browse Source
This commit is contained in:
Mauricio Siu
2025-03-23 04:42:56 -06:00
parent 2f4a3c964c 9535fca28f
commit fb0272a64d
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/dokploy/components/dashboard/compose/general/show-converted-compose.tsx
View File

@@ -62,6 +62,11 @@ export const ShowConvertedCompose = ({ composeId }: Props) => {
</DialogHeader> </DialogHeader>
{isError && <AlertBlock type="error">{error?.message}</AlertBlock>} {isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
<AlertBlock type="info">
Preview your docker-compose file with added domains. Note: At least
one domain must be specified for this conversion to take effect.
</AlertBlock>
<div className="flex flex-row gap-2 justify-end"> <div className="flex flex-row gap-2 justify-end">
<Button <Button
variant="secondary" variant="secondary"

6
packages/server/src/utils/backups/index.ts
View File

@@ -80,7 +80,8 @@ export const initCronJobs = async () => {
console.log( console.log(
`PG-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`, `PG-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
); );
runPostgresBackup(pg, backup); await runPostgresBackup(pg, backup);
await keepLatestNBackups(backup, pg.serverId);
}); });
} }
} }
@@ -112,6 +113,7 @@ export const initCronJobs = async () => {
`MARIADB-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`, `MARIADB-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
); );
await runMariadbBackup(maria, backup); await runMariadbBackup(maria, backup);
await keepLatestNBackups(backup, maria.serverId);
}); });
} }
} }
@@ -141,6 +143,7 @@ export const initCronJobs = async () => {
`MONGO-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`, `MONGO-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
); );
await runMongoBackup(mongo, backup); await runMongoBackup(mongo, backup);
await keepLatestNBackups(backup, mongo.serverId);
}); });
} }
} }
@@ -170,6 +173,7 @@ export const initCronJobs = async () => {
`MYSQL-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`, `MYSQL-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
); );
await runMySqlBackup(mysql, backup); await runMySqlBackup(mysql, backup);
await keepLatestNBackups(backup, mysql.serverId);
}); });
} }
} }