From 6533f8c60ef61b84ad27ea689c7b464777336f5a Mon Sep 17 00:00:00 2001 From: WickedYoda <68271168+wickedyoda@users.noreply.github.com> Date: Sat, 14 Mar 2026 13:47:38 -0500 Subject: [PATCH] backup fix --- .../docker-backup_files/docker-backup.sh | 129 ++++++++++++++---- updates_scripts/docker-run-netdata-install.sh | 21 +++ 2 files changed, 122 insertions(+), 28 deletions(-) create mode 100644 updates_scripts/docker-run-netdata-install.sh diff --git a/batch_files/docker-backup_files/docker-backup.sh b/batch_files/docker-backup_files/docker-backup.sh index 26fda5c..c1bfe7c 100644 --- a/batch_files/docker-backup_files/docker-backup.sh +++ b/batch_files/docker-backup_files/docker-backup.sh @@ -1,36 +1,109 @@ -#!/bin/bash +#!/usr/bin/env bash +set -euo pipefail -# --- CONFIG --- -SYSTEM_NAME="$(hostname)" -BACKUP_DATE="$(date +%Y-%m-%d)" -DEST_DIR="/mnt/naspublic/docker-backups/${SYSTEM_NAME}" -BACKUP_FILE="docker-backup-${SYSTEM_NAME}-${BACKUP_DATE}.tar.gz" -TMP_BACKUP="/tmp/${BACKUP_FILE}" -LOG_FILE="/var/log/docker-backup-log" +# ========================= +# Docker Backup Script +# ========================= -# --- START LOGGING --- -{ -echo "----- $(date '+%F %T') -----" -echo "๐Ÿ”„ Starting backup for system: $SYSTEM_NAME" +# Backup destination +BACKUP_BASE="/mnt/backup/docker-backups" -# --- CREATE DEST DIR IF NEEDED --- -mkdir -p "${DEST_DIR}" || echo "โš ๏ธ Could not create destination directory: ${DEST_DIR}" +# What to back up +SOURCE_PATHS=( + "/root/docker" + "/home/traver/docker" + "/var/lib/docker/volumes" +) -# --- CREATE COMPRESSED BACKUP, IGNORING READ ERRORS --- -echo "๐Ÿ“ฆ Creating compressed backup..." -tar -czf "${TMP_BACKUP}" --ignore-failed-read /root/docker /home/traver/docker +# Retention in days +RETENTION_DAYS=7 -# --- COPY TO DESTINATION --- -echo "๐Ÿ“ Copying to: ${DEST_DIR}/" -cp "${TMP_BACKUP}" "${DEST_DIR}/" || echo "โŒ Failed to copy backup to destination." +# Log file +LOG_FILE="/var/log/docker_backup.log" -# --- CLEANUP TEMP FILE --- -rm -f "${TMP_BACKUP}" || echo "โš ๏ธ Failed to remove temporary file." +# Stop containers during backup? true/false +STOP_CONTAINERS="false" -# --- DELETE FILES OLDER THAN 15 DAYS --- -echo "๐Ÿงน Cleaning up backups older than 15 days..." -find "${DEST_DIR}" -name "docker-backup-*.tar.gz" -type f -mtime +15 -exec rm -f {} \; +# Docker compose search roots for optional stop/start +COMPOSE_DIRS=( + "/root/docker" + "/home/traver/docker" +) -echo "โœ… Backup complete: ${DEST_DIR}/${BACKUP_FILE}" -echo -} >> "${LOG_FILE}" 2>&1 \ No newline at end of file +# Timestamp +TIMESTAMP="$(date '+%Y-%m-%d_%H-%M-%S')" +BACKUP_DIR="${BACKUP_BASE}/${TIMESTAMP}" + +log() { + echo "[$(date '+%F %T')] $*" | tee -a "$LOG_FILE" +} + +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 1 -maxdepth 1 -type d -mtime +"$RETENTION_DAYS" -exec rm -rf {} \; >>"$LOG_FILE" 2>&1 || true +} + +main() { + log "========================================" + log "Starting Docker backup" + + 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 "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 "$@" \ No newline at end of file diff --git a/updates_scripts/docker-run-netdata-install.sh b/updates_scripts/docker-run-netdata-install.sh new file mode 100644 index 0000000..3cb3281 --- /dev/null +++ b/updates_scripts/docker-run-netdata-install.sh @@ -0,0 +1,21 @@ +docker run -d --name=netdata \ + --pid=host \ + --network=host \ + -v netdataconfig:/etc/netdata \ + -v netdatalib:/var/lib/netdata \ + -v netdatacache:/var/cache/netdata \ + -v /:/host/root:ro,rslave \ + -v /etc/passwd:/host/etc/passwd:ro \ + -v /etc/group:/host/etc/group:ro \ + -v /etc/localtime:/etc/localtime:ro \ + -v /proc:/host/proc:ro \ + -v /sys:/host/sys:ro \ + -v /etc/os-release:/host/etc/os-release:ro \ + -v /var/log:/host/var/log:ro \ + -v /var/run/docker.sock:/var/run/docker.sock:ro \ + -v /run/dbus:/run/dbus:ro \ + --restart unless-stopped \ + --cap-add SYS_PTRACE \ + --cap-add SYS_ADMIN \ + --security-opt apparmor=unconfined \ + netdata/netdata \ No newline at end of file