reworked how it enters
Some checks failed
Build and Push Docker Image / build (push) Failing after 10s

This commit is contained in:
2025-10-19 23:34:23 -07:00
parent 7b8eecf20d
commit bbde15ddab
3 changed files with 61 additions and 66 deletions

View File

@@ -1,30 +1,27 @@
# === Dockerfile ===
FROM ghcr.io/linuxserver/duplicati:2.1.0 FROM ghcr.io/linuxserver/duplicati:2.1.0
# Remove old docker
RUN for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do apt-get remove $pkg; done
# Install Docker CLI + bash + core utilities # Install Docker CLI + bash + core utilities
RUN apt-get update \ RUN apt-get -y update \
&& apt-get install ca-certificates curl \ && apt-get -y --no-install-recommends install \
&& install -m 0755 -d /etc/apt/keyrings \ cron \
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc \ bash \
&& chmod a+r /etc/apt/keyrings/docker.asc \ ca-certificates \
&& echo \ curl \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ docker-ce-cli \
$(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \ postrgres17 \
tee /etc/apt/sources.list.d/docker.list > /dev/null \ && mkdir -p /backups \
&& apt-get update && rm -rf /var/lib/apt/lists/*
RUN apt-get -y install docker-ce docker-ce-cli \
&& containerd.io docker-buildx-plugin docker-compose-plugin postrgres17 \
&& mkdir -p /backups
# Copy backup script # Copy backup script
COPY backup.sh /usr/local/bin/backup.sh COPY backup.sh /usr/local/bin/backup.sh \
RUN chmod +x /usr/local/bin/backup.sh && backup.cron /etc/cron.d/backup \
&& startup.sh /usr/local/bin/startup.sh /
RUN chmod +x /usr/local/bin/backup.sh \
&& chmod 0644 /etc/cron.d/backup \
&& crontab /etc/cron.d/backup \
&& chmod +x /usr/local/bin/startup.sh
# Use bash as default # Use bash as default
ENTRYPOINT ["/usr/local/bin/backup.sh"] ENTRYPOINT ["/usr/local/bin/startup.sh"]

3
backup.cron Normal file
View File

@@ -0,0 +1,3 @@
# Run backup.sh once every 24 hours at 3:00 AM
0 3 * * * /usr/local/bin/backup.sh >> /var/log/backup.log 2>&1

View File

@@ -5,8 +5,7 @@
# === CONFIGURATION === # === CONFIGURATION ===
BACKUP_DIR="/backups/postgres_dumps" BACKUP_DIR="/backups/postgres_dumps"
INTERVAL_HOURS="${INTERVAL_HOURS:-24}" # Default to 24 hours if not set RETENTION_DAYS="${RETENTION_DAYS:-7}" # Keep 7 days of backups
RETENTION_DAYS="${RETENTION_DAYS:-7}" # Keep 7 days of backups
# List of known image name patterns # List of known image name patterns
KNOWN_IMAGES=$( KNOWN_IMAGES=$(
@@ -22,52 +21,48 @@ EOF
echo "[INFO] Starting PostgreSQL backup service..." echo "[INFO] Starting PostgreSQL backup service..."
mkdir -p "$BACKUP_DIR" mkdir -p "$BACKUP_DIR"
while true; do TIMESTAMP=$(date +'%Y-%m-%d_%H-%M-%S')
TIMESTAMP=$(date +'%Y-%m-%d_%H-%M-%S') echo "[INFO] $(date) - Starting backup cycle ($TIMESTAMP)"
echo "[INFO] $(date) - Starting backup cycle ($TIMESTAMP)" echo "[INFO] Checking for running Postgres containers..."
echo "[INFO] Checking for running Postgres containers..."
# Find running containers matching known image names # Find running containers matching known image names
MATCHING_CONTAINERS=$( MATCHING_CONTAINERS=$(
docker ps --format "{{.ID}} {{.Image}}" | while read -r ID IMAGE; do docker ps --format "{{.ID}} {{.Image}}" | while read -r ID IMAGE; do
for pattern in $KNOWN_IMAGES; do for pattern in $KNOWN_IMAGES; do
case "$IMAGE" in case "$IMAGE" in
*"$pattern"*) *"$pattern"*)
echo "$ID" echo "$ID"
break break
;; ;;
esac esac
done
done done
) done
)
if [ -z "$MATCHING_CONTAINERS" ]; then if [ -z "$MATCHING_CONTAINERS" ]; then
echo "[WARN] No Postgres containers found." echo "[WARN] No Postgres containers found."
else else
for container in $MATCHING_CONTAINERS; do for container in $MATCHING_CONTAINERS; do
NAME=$(docker inspect --format '{{.Name}}' "$container" | sed 's#^/##') NAME=$(docker inspect --format '{{.Name}}' "$container" | sed 's#^/##')
CONTAINER_BACKUP_DIR="$BACKUP_DIR/$NAME" CONTAINER_BACKUP_DIR="$BACKUP_DIR/$NAME"
FILE="$CONTAINER_BACKUP_DIR/${TIMESTAMP}.sql" FILE="$CONTAINER_BACKUP_DIR/${TIMESTAMP}.sql"
mkdir -p "$CONTAINER_BACKUP_DIR" mkdir -p "$CONTAINER_BACKUP_DIR"
echo "[INFO] Backing up container: $NAME ($container)" echo "[INFO] Backing up container: $NAME ($container)"
PG_USER=$(docker inspect --format '{{range .Config.Env}}{{println .}}{{end}}' "$container" | grep POSTGRES_USER | cut -d= -f2) PG_USER=$(docker inspect --format '{{range .Config.Env}}{{println .}}{{end}}' "$container" | grep POSTGRES_USER | cut -d= -f2)
PG_PASS=$(docker inspect --format '{{range .Config.Env}}{{println .}}{{end}}' "$container" | grep POSTGRES_PASSWORD | cut -d= -f2) PG_PASS=$(docker inspect --format '{{range .Config.Env}}{{println .}}{{end}}' "$container" | grep POSTGRES_PASSWORD | cut -d= -f2)
if docker exec -e PGPASSWORD="$PG_PASS" "$container" pg_dumpall -U "$PG_USER" -h 127.0.0.1 >"$FILE" 2>/tmp/pg_backup_error.log; then if docker exec -e PGPASSWORD="$PG_PASS" "$container" pg_dumpall -U "$PG_USER" -h 127.0.0.1 >"$FILE" 2>/tmp/pg_backup_error.log; then
echo "[SUCCESS] Backup complete for $NAME -> $FILE" echo "[SUCCESS] Backup complete for $NAME -> $FILE"
else else
echo "[ERROR] Backup failed for $NAME (check /tmp/pg_backup_error.log)" echo "[ERROR] Backup failed for $NAME (check /tmp/pg_backup_error.log)"
fi fi
# Retention cleanup # Retention cleanup
find "$CONTAINER_BACKUP_DIR" -type f -mtime +$RETENTION_DAYS -name '*.sql' -delete find "$CONTAINER_BACKUP_DIR" -type f -mtime +$RETENTION_DAYS -name '*.sql' -delete
done done
fi fi
echo "[INFO] Creating a snapshot of /srv/appdata" echo "[INFO] Creating a snapshot of /srv/appdata"
btrfs subvolume snapshot -r /source/appdata /backups/snapshots/$(hostname)-$(date +%F) btrfs subvolume snapshot -r /source/appdata /backups/snapshots/$(hostname)-$(date +%F)
echo "[INFO] Backup cycle complete." echo "[INFO] Backup cycle complete."
echo "[INFO] Sleeping for ${INTERVAL_HOURS}h..."
sleep "${INTERVAL_HOURS}h"
done