Merge pull request #89 from wickedyoda/macos-update

Macos update
This commit is contained in:
WickedYoda authored and GitHub committed 2026-08-05 13:20:24 -05:00
commit 1e25e36ce6
195 files changed
+152301

No files matched your search

+22
View File
@@ -0,0 +1,22 @@
# 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.
- `update_docker-backup.sh` replaces previously installed backup scripts on a system and refreshes the cron job.
## Usage
- Review the scripts before running them.
- Run the install or correction scripts as `root`.
- Run `update_docker-backup.sh` as `root` on existing systems to replace older installed copies.
- 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 set includes `/root/docker`, `/opt/docker`, `/var/lib/docker/volumes`, and `/home/traver/docker`.
- The backup job runs every 3 hours.
- Backups older than 14 days are removed automatically.
+69
View File
@@ -0,0 +1,69 @@
#!/usr/bin/env bash
set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
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'
FILES_TO_INSTALL=(
"docker-backup.sh"
"setup_docker-backup.sh"
"correct_docker-backup.sh"
"update_docker-backup.sh"
)
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_scripts() {
local file
for file in "${FILES_TO_INSTALL[@]}"; do
install -m 755 "${SCRIPT_DIR}/${file}" "${DEST_DIR}/${file}"
echo "Installed ${DEST_DIR}/${file}"
done
}
install_scripts
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 backup scripts were updated and will run every 3 hours."
+162
View File
@@ -0,0 +1,162 @@
#!/usr/bin/env bash
set -euo pipefail
# =========================
# Docker Backup Script
# =========================
# Backup destination
NAS_ROOT="/mnt/naspublic"
HOSTNAME="$(hostname -s)"
BACKUP_BASE="${NAS_ROOT}/docker-backup/${HOSTNAME}"
# What to back up
SOURCE_PATHS=(
"/root/docker"
"/opt/docker"
"/var/lib/docker/volumes"
"/home/traver/docker"
)
# Retention in days
RETENTION_DAYS=14
# Log file
LOG_FILE="/var/log/docker_backup.log"
# Stop containers during backup? true/false
STOP_CONTAINERS="false"
# Docker compose search roots for optional stop/start
COMPOSE_DIRS=(
"/root/docker"
"/opt/docker"
"/home/traver/docker"
)
# 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
if [[ -d "$dir" ]]; then
while IFS= read -r -d '' compose_file; do
compose_path="$(dirname "$compose_file")"
log "Starting stack in $compose_path"
docker compose -f "$compose_file" up -d >>"$LOG_FILE" 2>&1 || log "Warning: failed to start stack in $compose_path"
done < <(find "$dir" -type f \( -name "docker-compose.yml" -o -name "compose.yml" -o -name "docker-compose.yaml" -o -name "compose.yaml" \) -print0)
fi
done
}
stop_containers() {
log "Stopping Docker Compose stacks..."
for dir in "${COMPOSE_DIRS[@]}"; do
if [[ -d "$dir" ]]; then
while IFS= read -r -d '' compose_file; do
compose_path="$(dirname "$compose_file")"
log "Stopping stack in $compose_path"
docker compose -f "$compose_file" down >>"$LOG_FILE" 2>&1 || log "Warning: failed to stop stack in $compose_path"
done < <(find "$dir" -type f \( -name "docker-compose.yml" -o -name "compose.yml" -o -name "docker-compose.yaml" -o -name "compose.yaml" \) -print0)
fi
done
}
cleanup_old_backups() {
log "Removing backups older than ${RETENTION_DAYS} days from ${BACKUP_BASE}"
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"
if [[ "$STOP_CONTAINERS" == "true" ]]; then
stop_containers
fi
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
if [[ "$STOP_CONTAINERS" == "true" ]]; then
start_containers
fi
cleanup_old_backups
log "Docker backup completed successfully"
log "========================================"
}
main "$@"
+87
View File
@@ -0,0 +1,87 @@
#!/usr/bin/env bash
set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
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'
FILES_TO_INSTALL=(
"docker-backup.sh"
"setup_docker-backup.sh"
"correct_docker-backup.sh"
"update_docker-backup.sh"
)
if [[ "${EUID}" -ne 0 ]]; then
echo "Run this script as root."
exit 1
fi
detect_mode() {
# Treat as update only when concrete install artifacts are present.
if [[ -f "${DEST_SCRIPT}" || -f "${CRON_JOB_FILE}" ]]; then
echo "update"
else
echo "first-time"
fi
}
MODE="$(detect_mode)"
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_scripts() {
local file
for file in "${FILES_TO_INSTALL[@]}"; do
install -m 755 "${SCRIPT_DIR}/${file}" "${DEST_DIR}/${file}"
echo "Installed ${DEST_DIR}/${file}"
done
}
install_scripts
if [[ "${MODE}" == "first-time" ]]; then
echo "No existing Docker backup install detected. Installing Docker backup scripts and cron configuration."
else
echo "Existing Docker backup install detected. Reinstalling Docker backup scripts and refreshing cron configuration."
fi
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 "Installed helper scripts: ${DEST_DIR}/correct_docker-backup.sh and ${DEST_DIR}/update_docker-backup.sh"
echo "Complete: setup/update finished with current Docker backup configuration."
+71
View File
@@ -0,0 +1,71 @@
#!/usr/bin/env bash
set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
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'
FILES_TO_INSTALL=(
"docker-backup.sh"
"setup_docker-backup.sh"
"correct_docker-backup.sh"
"update_docker-backup.sh"
)
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
}
install_scripts() {
local file
mkdir -p "${DEST_DIR}"
for file in "${FILES_TO_INSTALL[@]}"; do
install -m 755 "${SCRIPT_DIR}/${file}" "${DEST_DIR}/${file}"
echo "Installed ${DEST_DIR}/${file}"
done
}
install_cron_job() {
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}"
}
remove_legacy_cron_jobs
install_scripts
install_cron_job
echo "Docker backup scripts were updated and the 3-hour cron job was refreshed."