Merge pull request #63 from wickedyoda/Fixing_Backups

Fixing backups
This commit is contained in:
WickedYoda authored and GitHub committed 2026-03-21 18:27:45 -05:00
commit 5f7ca9020f
7 files changed
+205 -95

No files matched your search

+19
View File
@@ -0,0 +1,19 @@
# Docker_backup
## Overview
This directory contains the Docker backup scripts for this repository.
## Files
- `docker-backup.sh` backs up Docker data to the NAS share.
- `setup_docker-backup.sh` installs the backup script and cron job on a new system.
- `correct_docker-backup.sh` repairs older installs and rewrites the cron job.
## Usage
- Review the scripts before running them.
- Run the install or correction scripts as `root`.
- Adjust paths if the target system uses different Docker or NAS mount locations.
## Notes
- Backups are written to `/mnt/naspublic/docker-backup/{hostname}/{month}/{date}/`.
- The backup job runs every 3 hours.
- Backups older than 14 days are removed automatically.
+57
View File
@@ -0,0 +1,57 @@
#!/usr/bin/env bash
set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
SRC_SCRIPT="${SCRIPT_DIR}/docker-backup.sh"
DEST_DIR="/root/docker"
DEST_SCRIPT="${DEST_DIR}/docker-backup.sh"
CRON_JOB_FILE="/etc/cron.d/docker-backup"
LOG_FILE="/var/log/docker_backup.log"
CRON_MATCH='docker-backup\.sh|docker_backup\.log|docker-backup-log'
if [[ "${EUID}" -ne 0 ]]; then
echo "Run this script as root."
exit 1
fi
remove_legacy_cron_jobs() {
local cron_file
while IFS= read -r cron_file; do
rm -f "$cron_file"
echo "Removed legacy cron file ${cron_file}"
done < <(grep -El "${CRON_MATCH}" /etc/cron.d/* 2>/dev/null || true)
if [[ -f /etc/crontab ]] && grep -Eq "${CRON_MATCH}" /etc/crontab; then
grep -Ev "${CRON_MATCH}" /etc/crontab >/tmp/docker-backup-etc-crontab.cleaned || true
install -m 644 /tmp/docker-backup-etc-crontab.cleaned /etc/crontab
rm -f /tmp/docker-backup-etc-crontab.cleaned
echo "Removed legacy Docker backup entries from /etc/crontab"
fi
if crontab -l -u root >/tmp/docker-backup-root-crontab 2>/dev/null; then
grep -Ev "${CRON_MATCH}" /tmp/docker-backup-root-crontab >/tmp/docker-backup-root-crontab.cleaned || true
crontab -u root /tmp/docker-backup-root-crontab.cleaned
rm -f /tmp/docker-backup-root-crontab /tmp/docker-backup-root-crontab.cleaned
echo "Removed legacy Docker backup entries from root crontab"
fi
}
remove_legacy_cron_jobs
mkdir -p "${DEST_DIR}"
install -m 755 "${SRC_SCRIPT}" "${DEST_SCRIPT}"
echo "Installed ${DEST_SCRIPT}"
cat > "${CRON_JOB_FILE}" <<EOF
SHELL=/bin/bash
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
# Run every 3 hours
0 */3 * * * root ${DEST_SCRIPT} >> ${LOG_FILE} 2>&1
EOF
chmod 644 "${CRON_JOB_FILE}"
echo "Installed ${CRON_JOB_FILE}"
echo "Docker backups will run every 3 hours."
@@ -6,17 +6,19 @@ set -euo pipefail
# =========================
# Backup destination
BACKUP_BASE="/mnt/backup/docker-backups"
NAS_ROOT="/mnt/naspublic"
HOSTNAME="$(hostname -s)"
BACKUP_BASE="${NAS_ROOT}/docker-backup/${HOSTNAME}"
# What to back up
SOURCE_PATHS=(
"/root/docker"
"/home/traver/docker"
"/var/lib/docker/volumes"
"/home/traver/docker"
)
# Retention in days
RETENTION_DAYS=7
RETENTION_DAYS=14
# Log file
LOG_FILE="/var/log/docker_backup.log"
@@ -30,14 +32,44 @@ COMPOSE_DIRS=(
"/home/traver/docker"
)
# Timestamp
TIMESTAMP="$(date '+%Y-%m-%d_%H-%M-%S')"
BACKUP_DIR="${BACKUP_BASE}/${TIMESTAMP}"
# Date/time foldering
MONTH_STAMP="$(date '+%Y-%m')"
DATE_STAMP="$(date '+%Y-%m-%d')"
TIME_STAMP="$(date '+%H-%M-%S')"
BACKUP_DIR="${BACKUP_BASE}/${MONTH_STAMP}/${DATE_STAMP}"
log() {
echo "[$(date '+%F %T')] $*" | tee -a "$LOG_FILE"
}
archive_name_for_path() {
local path="$1"
echo "${path#/}" | tr '/' '_'
}
require_backup_target() {
if command -v mountpoint >/dev/null 2>&1; then
mountpoint -q "$NAS_ROOT" || {
log "Error: ${NAS_ROOT} is not mounted. Aborting backup."
exit 1
}
return
fi
if command -v findmnt >/dev/null 2>&1; then
findmnt -rn "$NAS_ROOT" >/dev/null 2>&1 || {
log "Error: ${NAS_ROOT} is not mounted. Aborting backup."
exit 1
}
return
fi
if [[ ! -d "$NAS_ROOT" ]]; then
log "Error: ${NAS_ROOT} is not mounted. Aborting backup."
exit 1
fi
}
start_containers() {
log "Starting Docker Compose stacks..."
for dir in "${COMPOSE_DIRS[@]}"; do
@@ -66,32 +98,51 @@ stop_containers() {
cleanup_old_backups() {
log "Removing backups older than ${RETENTION_DAYS} days from ${BACKUP_BASE}"
find "$BACKUP_BASE" -mindepth 1 -maxdepth 1 -type d -mtime +"$RETENTION_DAYS" -exec rm -rf {} \; >>"$LOG_FILE" 2>&1 || true
find "$BACKUP_BASE" -mindepth 2 -maxdepth 2 -type d -mtime +"$RETENTION_DAYS" -exec rm -rf {} + >>"$LOG_FILE" 2>&1 || true
find "$BACKUP_BASE" -mindepth 1 -maxdepth 1 -type d -empty -delete >>"$LOG_FILE" 2>&1 || true
}
create_archive() {
local path="$1"
local archive_name
local archive_path
local parent_dir
local base_name
if [[ ! -e "$path" ]]; then
log "Warning: source path missing: $path"
return 0
fi
archive_name="$(archive_name_for_path "$path")"
archive_path="${BACKUP_DIR}/${TIME_STAMP}_${archive_name}.tar.gz"
parent_dir="$(dirname "$path")"
base_name="$(basename "$path")"
log "Creating archive ${archive_path} from ${path}"
if command -v pigz >/dev/null 2>&1; then
tar --xattrs --acls --numeric-owner -cpf - -C "$parent_dir" "$base_name" 2>>"$LOG_FILE" | pigz 2>>"$LOG_FILE" > "$archive_path"
else
tar --xattrs --acls --numeric-owner -czpf "$archive_path" -C "$parent_dir" "$base_name" >>"$LOG_FILE" 2>&1
fi
}
main() {
log "========================================"
log "Starting Docker backup"
require_backup_target
mkdir -p "$BACKUP_BASE"
mkdir -p "$BACKUP_DIR"
for path in "${SOURCE_PATHS[@]}"; do
if [[ ! -e "$path" ]]; then
log "Warning: source path missing: $path"
fi
done
if [[ "$STOP_CONTAINERS" == "true" ]]; then
stop_containers
fi
log "Running rsync backup to $BACKUP_DIR"
rsync -aHAX --delete \
/root/docker \
/home/traver/docker \
/var/lib/docker/volumes \
"$BACKUP_DIR"/ >>"$LOG_FILE" 2>&1
log "Creating separate compressed backups in $BACKUP_DIR"
for path in "${SOURCE_PATHS[@]}"; do
create_archive "$path"
done
log "Backup sizes:"
du -sh "$BACKUP_DIR" >>"$LOG_FILE" 2>&1 || true
@@ -106,4 +157,4 @@ main() {
log "========================================"
}
main "$@"
main "$@"
+57
View File
@@ -0,0 +1,57 @@
#!/usr/bin/env bash
set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# --- CONFIG ---
SRC_SCRIPT="${SCRIPT_DIR}/docker-backup.sh"
DEST_DIR="/root/docker"
DEST_SCRIPT="${DEST_DIR}/docker-backup.sh"
CRON_JOB_FILE="/etc/cron.d/docker-backup"
LOG_FILE="/var/log/docker_backup.log"
CRON_MATCH='docker-backup\.sh|docker_backup\.log|docker-backup-log'
if [[ "${EUID}" -ne 0 ]]; then
echo "Run this script as root."
exit 1
fi
remove_legacy_cron_jobs() {
local cron_file
while IFS= read -r cron_file; do
rm -f "$cron_file"
echo "Removed legacy cron file ${cron_file}"
done < <(grep -El "${CRON_MATCH}" /etc/cron.d/* 2>/dev/null || true)
if [[ -f /etc/crontab ]] && grep -Eq "${CRON_MATCH}" /etc/crontab; then
grep -Ev "${CRON_MATCH}" /etc/crontab >/tmp/docker-backup-etc-crontab.cleaned || true
install -m 644 /tmp/docker-backup-etc-crontab.cleaned /etc/crontab
rm -f /tmp/docker-backup-etc-crontab.cleaned
echo "Removed legacy Docker backup entries from /etc/crontab"
fi
if crontab -l -u root >/tmp/docker-backup-root-crontab 2>/dev/null; then
grep -Ev "${CRON_MATCH}" /tmp/docker-backup-root-crontab >/tmp/docker-backup-root-crontab.cleaned || true
crontab -u root /tmp/docker-backup-root-crontab.cleaned
rm -f /tmp/docker-backup-root-crontab /tmp/docker-backup-root-crontab.cleaned
echo "Removed legacy Docker backup entries from root crontab"
fi
}
remove_legacy_cron_jobs
mkdir -p "${DEST_DIR}"
install -m 755 "${SRC_SCRIPT}" "${DEST_SCRIPT}"
echo "Installed ${DEST_SCRIPT}"
cat > "${CRON_JOB_FILE}" <<EOF
SHELL=/bin/bash
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
# Run every 3 hours
0 */3 * * * root ${DEST_SCRIPT} >> ${LOG_FILE} 2>&1
EOF
chmod 644 "${CRON_JOB_FILE}"
echo "Installed ${CRON_JOB_FILE}"
-43
View File
@@ -1,43 +0,0 @@
<<<<<<< HEAD
# docker-backup_files
## Purpose
This directory contains files related to **docker backup files**.
## Contents
- `docker-backup.sh`
- `setup_docker-backup.sh`
## Usage
- Review each script or configuration file before running
- Some scripts may require **root or sudo**
- Paths and variables may need adjustment for your environment
## Notes
- This folder is part of the **public-setupfiles** repository
- Files are provided as-is for reference or automation
## Safety
Always back up data before running scripts that modify system state.
=======
# docker-backup_files
## Overview
This directory is part of the **public-setupfiles** repository.
It contains scripts, configuration files, or resources related to **docker-backup_files**.
## Usage
- Review scripts before execution
- Some files may require **root or sudo privileges**
- Paths, variables, or credentials may need customization
## Logging & Output
Scripts may generate logs or output files in the same directory or system locations.
## Safety Notes
- Always back up important data before running scripts
- Test in a non-production environment when possible
- Use at your own risk
---
>>>>>>> main
@@ -1,31 +0,0 @@
#!/bin/bash
# --- CONFIG ---
SRC_SCRIPT="./docker-backup.sh"
DEST_SCRIPT="/root/docker/docker-backup.sh"
CRON_JOB_FILE="/etc/cron.d/docker-backup"
LOG_FILE="/var/log/docker-backup-log"
# --- ENSURE /root/docker EXISTS ---
mkdir -p /root/docker
# --- COPY OR REPLACE SCRIPT ---
cp "${SRC_SCRIPT}" "${DEST_SCRIPT}" || {
echo "❌ Failed to copy ${SRC_SCRIPT} to ${DEST_SCRIPT}"
exit 1
}
chmod +x "${DEST_SCRIPT}"
echo "✅ Script installed to ${DEST_SCRIPT} and made executable."
# --- WRITE CRON JOB WITH RANDOM DELAY UP TO 2 HOURS ---
cat > "${CRON_JOB_FILE}" <<EOF
SHELL=/bin/bash
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
# Run daily with a random delay of up to 7200 seconds (2 hours)
0 2 * * * root sleep \$((RANDOM % 7200)) && ${DEST_SCRIPT} >> ${LOG_FILE} 2>&1
EOF
chmod 644 "${CRON_JOB_FILE}"
echo "✅ Cron job installed in ${CRON_JOB_FILE}"
@@ -1,6 +1,6 @@
docker run -d \
--name netdata \
--hostname docker1 \
--hostname docker3 \
--pid host \
--network host \
--restart unless-stopped \