Обновлен файл .gitignore для игнорирования директории var/*, изменена конфигурация сервиса sqlite_backup в docker-compose.yml для сборки из Dockerfile, обновлен базовый образ в Dockerfile с alpine:latest на alpine:3.19, изменена команда загрузки rclone с curl на wget, а также изменен вывод скрипта backup.sh в entrypoint.sh для записи логов.

.gitignore

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

Dockerfile

@@ -1,17 +1,18 @@
-FROM alpine:latest
+FROM alpine:3.19
 
 ENV TZ=UTC
 LABEL maintainer="Vassiliy Yegorov <vasyakrg@gmail.com>"
 
 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 && \
+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 && \
     cp rclone /usr/bin/ && \
     chown root:root /usr/bin/rclone && \

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:

scripts/entrypoint.sh

@@ -1,8 +1,17 @@
 #!/bin/sh
 
-# Create crontab in a writable location
+# Create crontab in a writable location and set proper permissions
 mkdir -p /tmp/crontabs
-echo "${CRONTAB} /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
 
-/scripts/backup.sh
+# Run initial backup
-exec crond -f -c /tmp/crontabs
+# /scripts/backup.sh
+
+# Start crond with debug output
+echo "Starting crond with config:"
+cat /tmp/crontabs/root
+echo "---"
+
+# Start crond in foreground with debug output
+exec crond -f -c /tmp/crontabs -d 8

scripts/minio_uploader.sh

@@ -20,14 +20,14 @@ EOF
 case $1 in
 	copy)
 		echo "copy from $2 to $3"
-		rclone copy --progress $2 myminio:$3
+		rclone copy --progress $2 $3
 	;;
 	list)
-		echo "list $2"
+		echo "list ${MINIO_PATH}/$2"
-		rclone ls myminio:$2
+		rclone ls ${MINIO_PATH}/$2
 	;;
 	delete)
-		echo "delete $2"
+		echo "delete ${MINIO_PATH}/$2"
-		rclone delete myminio:$2
+		rclone delete ${MINIO_PATH}/$2
 	;;
 esac