From 4d2e79fef73dbbd118ee73756bebfec633ffb744 Mon Sep 17 00:00:00 2001 From: Vassiliy Yegorov Date: Sun, 31 Aug 2025 21:15:11 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=84=D0=B0=D0=B9=D0=BB=20.gitignore=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=B8=20var/*,=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?= =?UTF-8?q?=D1=83=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20=D1=81=D0=B5=D1=80=D0=B2?= =?UTF-8?q?=D0=B8=D1=81=D0=B0=20sqlite=5Fbackup=20=D0=B2=20docker-compose.?= =?UTF-8?q?yml=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=B8=D0=B7=20Dockerfile,=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D1=8B=D0=B9?= =?UTF-8?q?=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=20=D0=B2=20Dockerfile=20?= =?UTF-8?q?=D1=81=20alpine:latest=20=D0=BD=D0=B0=20alpine:3.19,=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7?= =?UTF-8?q?=D0=BA=D0=B8=20rclone=20=D1=81=20curl=20=D0=BD=D0=B0=20wget,=20?= =?UTF-8?q?=D0=B0=20=D1=82=D0=B0=D0=BA=D0=B6=D0=B5=20=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20?= =?UTF-8?q?=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B0=20backup.sh=20=D0=B2?= =?UTF-8?q?=20entrypoint.sh=20=D0=B4=D0=BB=D1=8F=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D0=B8=20=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + Dockerfile | 11 ++++++----- docker-compose.yml | 5 ++++- scripts/entrypoint.sh | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index de03f38..b0f0f09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea .env +var/* diff --git a/Dockerfile b/Dockerfile index 53f0de7..01cbfe3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,18 @@ -FROM alpine:latest +FROM alpine:3.19 ENV TZ=UTC LABEL maintainer="Vassiliy Yegorov " RUN apk add --no-cache \ sqlite \ - curl \ + wget \ bash \ tzdata \ - openssl + openssl \ + && rm -rf /var/cache/apk/* -RUN curl -O https://downloads.rclone.org/rclone-current-linux-amd64.zip && \ - unzip rclone-current-linux-amd64.zip && \ +RUN wget https://github.com/rclone/rclone/releases/download/v1.71.0/rclone-v1.71.0-linux-amd64.zip && \ + unzip rclone-v1.71.0-linux-amd64.zip && \ cd rclone-*-linux-amd64 && \ cp rclone /usr/bin/ && \ chown root:root /usr/bin/rclone && \ diff --git a/docker-compose.yml b/docker-compose.yml index 18f0c07..1861155 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,9 @@ services: sqlite_backup: - image: git.realmanual.ru/pub/sqlite-backup/backup:latest + # image: git.realmanual.ru/pub/sqlite-backup/backup:latest + build: + context: . + dockerfile: Dockerfile container_name: sqlite_backup restart: always volumes: diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index fec4353..6cb006c 100644 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -2,11 +2,11 @@ # Create crontab in a writable location and set proper permissions mkdir -p /tmp/crontabs -echo "${CRONTAB:-"0 * * * *"} /scripts/backup.sh" > /tmp/crontabs/root +echo "${CRONTAB:-"0 * * * *"} /scripts/backup.sh >> /proc/1/fd/1 2>&1" > /tmp/crontabs/root chmod 644 /tmp/crontabs/root # Run initial backup -/scripts/backup.sh +# /scripts/backup.sh # Start crond with debug output echo "Starting crond with config:"