Skip to content

Commit 496e03c

Browse files
committed
fix: Fixed again the issue where docker-backup-a only backs up one container
1 parent 4e30b4f commit 496e03c

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

docker-backup.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,11 @@ backup_volumes() {
260260
fi
261261

262262
# 保存数据卷信息
263-
docker volume inspect "${volume}" > "${backup_dir}/volumes/${volume}_info.json" 2>/dev/null || true
263+
if docker volume inspect "${volume}" > "${backup_dir}/volumes/${volume}_info.json" 2>/dev/null; then
264+
log_debug "保存数据卷信息: ${volume}"
265+
else
266+
log_warning "无法保存数据卷信息: ${volume}"
267+
fi
264268
done
265269
else
266270
log_info " 未发现数据卷"
@@ -298,7 +302,11 @@ backup_logs() {
298302
log_info "收集容器 '${container_name}' 的日志..."
299303

300304
# 获取容器日志(最近1000行)
301-
docker logs --tail 1000 "${container_name}" > "${backup_dir}/logs/container.log" 2>&1 || true
305+
if docker logs --tail 1000 "${container_name}" > "${backup_dir}/logs/container.log" 2>&1; then
306+
log_debug "成功收集日志: ${container_name}"
307+
else
308+
log_warning "无法收集日志: ${container_name}"
309+
fi
302310

303311
log_success "日志收集完成"
304312
}
@@ -421,7 +429,7 @@ $([ "${FULL_BACKUP}" == true ] && echo "- 容器镜像 ✓" || echo "- 容器镜
421429
2. 执行 ./restore.sh 脚本恢复数据
422430
3. 参考 config/ 目录中的配置手动创建容器
423431
424-
备份大小: $(du -sh "${backup_dir}" | cut -f1)
432+
备份大小: $(du -sh "${backup_dir}" 2>/dev/null | cut -f1 || echo "计算中...")
425433
EOF
426434
}
427435

@@ -450,6 +458,7 @@ backup_container() {
450458
create_backup_summary "${container_backup_dir}" "${container_name}"
451459

452460
log_success "容器 '${container_name}' 备份完成: ${container_backup_dir}"
461+
log_debug "备份函数正常返回,准备处理下一个容器"
453462

454463
return 0
455464
}

0 commit comments

Comments
 (0)