From 25bf0f8202b9d48b1aae350309b2f078810876df Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 12 Feb 2026 17:44:22 +0100 Subject: [PATCH] all good --- README.md | 4 +-- backup.sh | 33 ------------------- compose.yml | 8 ++--- backup.Dockerfile => config/backup.Dockerfile | 0 opcache.ini => config/opcache.ini | 0 uploads.ini => config/uploads.ini | 0 backup-container.sh => scripts/backup.sh | 0 7 files changed, 5 insertions(+), 40 deletions(-) delete mode 100755 backup.sh rename backup.Dockerfile => config/backup.Dockerfile (100%) rename opcache.ini => config/opcache.ini (100%) rename uploads.ini => config/uploads.ini (100%) rename backup-container.sh => scripts/backup.sh (100%) diff --git a/README.md b/README.md index c8f9ed7..07bf6a9 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,4 @@ Konfigurierbar über `.env`: Backups landen in `./backups/`. Manuelles Backup auslösen: ``` docker compose exec backup /usr/local/bin/backup.sh -``` - -Das alte `backup.sh` auf dem Host funktioniert weiterhin für manuelle Backups. \ No newline at end of file +``` \ No newline at end of file diff --git a/backup.sh b/backup.sh deleted file mode 100755 index 9692d1c..0000000 --- a/backup.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# stop on error -set -e - -DATE=$(date +"%Y-%m-%d") -BACKUP_NAME="${DATE}.tar.gz" - -# dir of this script that will also work when called from elsewhere -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -cd "$DIR" || exit 1 - -# load .env variables -if [ -f "$DIR/.env" ]; then - export $(grep -v '^#' "$DIR/.env" | xargs) -fi - -# --- PREPARE --- -mkdir -p "${DIR}/backups" - -echo "Creating DB dump..." -docker compose exec db mariadb-dump --no-tablespaces -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" > "db_dump_${DATE}.sql" - -echo "Creating tar.gz archive..." -tar -czf "${DIR}/backups/${BACKUP_NAME}" --exclude='db' --exclude='.git' --exclude='static' --exclude='backups' --exclude='db_import' "." "db_dump_${DATE}.sql" - -echo "Cleaning up temp SQL dump..." -rm "db_dump_${DATE}.sql" - -echo "Cleaning up local backups older than 7 days..." -find "${DIR}/backups" -name "*.tar.gz" -type f -mtime +7 -delete - -echo "✅ Backup complete: ${DIR}/backups/${BACKUP_NAME}" \ No newline at end of file diff --git a/compose.yml b/compose.yml index 3575d4d..5942ed2 100644 --- a/compose.yml +++ b/compose.yml @@ -43,8 +43,8 @@ services: condition: service_healthy volumes: - ./wp:/var/www/html - - ./uploads.ini:/usr/local/etc/php/conf.d/uploads.ini - - ./opcache.ini:/usr/local/etc/php/conf.d/opcache.ini + - ./config/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini + - ./config/opcache.ini:/usr/local/etc/php/conf.d/opcache.ini - ./static:/export ports: - ${WP_PORT:-8080}:80 @@ -79,7 +79,7 @@ services: backup: build: context: . - dockerfile: backup.Dockerfile + dockerfile: config/backup.Dockerfile restart: unless-stopped depends_on: db: @@ -92,7 +92,7 @@ services: echo "Backup container ready. Schedule: ${BACKUP_SCHEDULE:-0 2 * * *}" crond -f -l 2 volumes: - - ./backup-container.sh:/usr/local/bin/backup.sh:ro + - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro - ./wp:/source/wp:ro - ./backups:/backups environment: diff --git a/backup.Dockerfile b/config/backup.Dockerfile similarity index 100% rename from backup.Dockerfile rename to config/backup.Dockerfile diff --git a/opcache.ini b/config/opcache.ini similarity index 100% rename from opcache.ini rename to config/opcache.ini diff --git a/uploads.ini b/config/uploads.ini similarity index 100% rename from uploads.ini rename to config/uploads.ini diff --git a/backup-container.sh b/scripts/backup.sh similarity index 100% rename from backup-container.sh rename to scripts/backup.sh