7 Commits
1.0.21 ... main

Author SHA1 Message Date
49e777ece1 Упрощен скрипт entrypoint.sh: изменен путь для crontab, улучшен вывод при запуске crond, добавлена обработка ошибок.
All checks were successful
docker-build / Build image (push) Successful in 1m59s
2025-09-08 12:17:21 +07:00
4d2e79fef7 Обновлен файл .gitignore для игнорирования директории var/*, изменена конфигурация сервиса sqlite_backup в docker-compose.yml для сборки из Dockerfile, обновлен базовый образ в Dockerfile с alpine:latest на alpine:3.19, изменена команда загрузки rclone с curl на wget, а также изменен вывод скрипта backup.sh в entrypoint.sh для записи логов.
All checks were successful
docker-build / Build image (push) Successful in 23m28s
2025-08-31 21:15:11 +07:00
63f6f969cc Обновлен скрипт entrypoint.sh: добавлены права доступа для crontab, улучшен вывод при запуске crond с отладочной информацией.
All checks were successful
docker-build / Build image (push) Successful in 35s
2025-08-31 20:34:12 +07:00
03fa82b223 Исправлены пути в выводе и командах rclone в скрипте minio_uploader.sh для использования переменной MINIO_PATH.
All checks were successful
docker-build / Build image (push) Successful in 32s
2025-08-31 20:26:09 +07:00
235b1a10d8 Упрощена команда rclone в скрипте minio_uploader.sh, убраны лишние ссылки на myminio.
All checks were successful
docker-build / Build image (push) Successful in 39s
2025-08-31 20:21:56 +07:00
1a01c67759 Исправлена команда rclone в скрипте minio_uploader.sh для корректного копирования файлов без указания целевого пути.
All checks were successful
docker-build / Build image (push) Successful in 1m0s
2025-08-31 20:18:53 +07:00
a45b2cfc60 Добавлен параметр no_check_bucket в скрипт minio_uploader.sh и изменена команда rclone для копирования файлов без пропуска существующих.
All checks were successful
docker-build / Build image (push) Successful in 28s
2025-08-31 20:09:15 +07:00
5 changed files with 25 additions and 15 deletions

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
.idea .idea
.env .env
var/*

View File

@@ -1,17 +1,18 @@
FROM alpine:latest FROM alpine:3.19
ENV TZ=UTC ENV TZ=UTC
LABEL maintainer="Vassiliy Yegorov <vasyakrg@gmail.com>" LABEL maintainer="Vassiliy Yegorov <vasyakrg@gmail.com>"
RUN apk add --no-cache \ RUN apk add --no-cache \
sqlite \ sqlite \
curl \ wget \
bash \ bash \
tzdata \ tzdata \
openssl openssl \
&& rm -rf /var/cache/apk/*
RUN curl -O https://downloads.rclone.org/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-current-linux-amd64.zip && \ unzip rclone-v1.71.0-linux-amd64.zip && \
cd rclone-*-linux-amd64 && \ cd rclone-*-linux-amd64 && \
cp rclone /usr/bin/ && \ cp rclone /usr/bin/ && \
chown root:root /usr/bin/rclone && \ chown root:root /usr/bin/rclone && \

View File

@@ -1,6 +1,9 @@
services: services:
sqlite_backup: 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 container_name: sqlite_backup
restart: always restart: always
volumes: volumes:

View File

@@ -1,8 +1,12 @@
#!/bin/sh #!/bin/sh
# Create crontab in a writable location set +e
mkdir -p /tmp/crontabs
echo "${CRONTAB} /scripts/backup.sh" > /tmp/crontabs/root
# Create crontab in a writable location and set proper permissions
echo "${CRONTAB:-"0 * * * *"} /scripts/backup.sh >> /proc/1/fd/1 2>&1" > /etc/crontabs/root
# Run initial backup
/scripts/backup.sh /scripts/backup.sh
exec crond -f -c /tmp/crontabs
# Start crond in foreground with debug output
exec crond -f -d 0

View File

@@ -14,19 +14,20 @@ secret_access_key = $MINIO_APPLICATION_KEY
endpoint = $MINIO_ENDPOINT endpoint = $MINIO_ENDPOINT
region = $MINIO_LOCATION region = $MINIO_LOCATION
acl = private acl = private
no_check_bucket = true
EOF EOF
case $1 in case $1 in
copy) copy)
echo "copy from $2 to $3" echo "copy from $2 to $3"
rclone copy --progress --skip-existing $2 myminio:$3 rclone copy --progress $2 $3
;; ;;
list) list)
echo "list $2" echo "list ${MINIO_PATH}/$2"
rclone ls myminio:$2 rclone ls ${MINIO_PATH}/$2
;; ;;
delete) delete)
echo "delete $2" echo "delete ${MINIO_PATH}/$2"
rclone delete myminio:$2 rclone delete ${MINIO_PATH}/$2
;; ;;
esac esac