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:"