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 pull request #1859 from yusoofsh/fix-swarm-database-backup-restore

Browse Source 
Fix container not found upon backup/restore on compose stack
This commit is contained in:
Mauricio Siu
2025-05-10 01:45:12 -06:00
committed by GitHub
parent fdaba7e752 1fcb1f2c5e
commit 25e1a9af57
2 changed files with 3557 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3553
bun.lock Normal file
View File

File diff suppressed because it is too large Load Diff

8
packages/server/src/utils/backups/utils.ts
View File

@@ -116,7 +116,7 @@ export const getComposeContainerCommand = (
composeType: "stack" | "docker-compose" | undefined, composeType: "stack" | "docker-compose" | undefined,
) => { ) => {
if (composeType === "stack") { if (composeType === "stack") {
return `docker ps -q --filter "status=running" --filter "label=com.docker.stack.namespace=${appName}" --filter "label=com.docker.swarm.service.name=${serviceName}" | head -n 1`; return `docker ps -q --filter "status=running" --filter "label=com.docker.stack.namespace=${appName}" --filter "label=com.docker.swarm.service.name=${appName}_${serviceName}" | head -n 1`;
} }
return `docker ps -q --filter "status=running" --filter "label=com.docker.compose.project=${appName}" --filter "label=com.docker.compose.service=${serviceName}" | head -n 1`; return `docker ps -q --filter "status=running" --filter "label=com.docker.compose.project=${appName}" --filter "label=com.docker.compose.service=${serviceName}" | head -n 1`;
}; };
@@ -234,7 +234,7 @@ export const getBackupCommand = (
fi fi
echo "[$(date)] Container Up: $CONTAINER_ID" >> ${logPath}; echo "[$(date)] Container Up: $CONTAINER_ID" >> ${logPath};
# Run the backup command and capture the exit status # Run the backup command and capture the exit status
BACKUP_OUTPUT=$(${backupCommand} 2>&1 >/dev/null) || { BACKUP_OUTPUT=$(${backupCommand} 2>&1 >/dev/null) || {
echo "[$(date)] ❌ Error: Backup failed" >> ${logPath}; echo "[$(date)] ❌ Error: Backup failed" >> ${logPath};
@@ -244,14 +244,14 @@ export const getBackupCommand = (
echo "[$(date)] ✅ backup completed successfully" >> ${logPath}; echo "[$(date)] ✅ backup completed successfully" >> ${logPath};
echo "[$(date)] Starting upload to S3..." >> ${logPath}; echo "[$(date)] Starting upload to S3..." >> ${logPath};
# Run the upload command and capture the exit status # Run the upload command and capture the exit status
UPLOAD_OUTPUT=$(${backupCommand} | ${rcloneCommand} 2>&1 >/dev/null) || { UPLOAD_OUTPUT=$(${backupCommand} | ${rcloneCommand} 2>&1 >/dev/null) || {
echo "[$(date)] ❌ Error: Upload to S3 failed" >> ${logPath}; echo "[$(date)] ❌ Error: Upload to S3 failed" >> ${logPath};
echo "Error: $UPLOAD_OUTPUT" >> ${logPath}; echo "Error: $UPLOAD_OUTPUT" >> ${logPath};
exit 1; exit 1;
} }
echo "[$(date)] ✅ Upload to S3 completed successfully" >> ${logPath}; echo "[$(date)] ✅ Upload to S3 completed successfully" >> ${logPath};
echo "Backup done ✅" >> ${logPath}; echo "Backup done ✅" >> ${logPath};
`; `;