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

.gitea/workflows/docker-build.yml

@@ -11,60 +11,29 @@ permissions:
 
 jobs:
   build:
-    runs-on: dind
-    services:
-      docker:
-        image: docker:dind
-        env:
-          DOCKER_TLS_CERTDIR: ""
-    container:
-      image: docker:24-git
-      env:
-        DOCKER_HOST: tcp://docker:2375
-        DOCKER_TLS_CERTDIR: ""
+    name: Build image
+    runs-on: ubuntu-22.04
+    container: catthehacker/ubuntu:act-latest
     env:
-      REGISTRY: hub.realmanual.ru
-      IMAGE_NAME: pub/sqlite-backup/backup
+      REGISTRY: git.realmanual.ru
+      IMAGE_NAME: ${{ gitea.repository }}
     steps:
-      - name: Checkout (git)
-        shell: sh
-        env:
-          TOKEN: ${{ secrets.GITEA_TOKEN }}
-        run: |
-          set -eu
-          : "${GITHUB_SERVER_URL:?}"
-          : "${GITHUB_REPOSITORY:?}"
-          : "${GITHUB_SHA:?}"
-          git init .
-          git remote add origin "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git"
-          git -c http.extraHeader="Authorization: Bearer ${TOKEN}" fetch --no-tags --depth=1 origin "${GITHUB_SHA}"
-          git checkout --detach "${GITHUB_SHA}"
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-      - name: Extract tag
-        id: vars
-        shell: sh
-        run: |
-          TAG_REF="${GITHUB_REF#refs/tags/}"
-          echo "tag=$TAG_REF" >> "$GITHUB_OUTPUT"
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.PUSH_TOKEN }}
 
-      - name: Docker login
-        shell: sh
-        run: |
-          set -eu
-          echo "${{ secrets.GITEA_TOKEN }}" | docker login "${{ env.REGISTRY }}" --username "${{ github.actor }}" --password-stdin
-
-      - name: Build image
-        shell: sh
-        run: |
-          set -eu
-          docker build \
-            -t "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.vars.outputs.tag }}" \
-            -t "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" \
-            .
-
-      - name: Push images
-        shell: sh
-        run: |
-          set -eu
-          docker push "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.vars.outputs.tag }}"
-          docker push "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ gitea.ref_name }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

.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 && \
-    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 && \

README.md

@@ -3,7 +3,7 @@
 ```yaml
 services:
   sqlite_backup:
-    image: hub.realmanual.ru/pub/sqlite-backup/backup:latest
+    image: git.realmanual.ru/pub/sqlite-backup-s3
     container_name: sqlite_backup
     restart: always
     volumes:

docker-build.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-DOCKER_BASEIMAGE=alpine:latest
+TAG=$1
 
-docker buildx build --platform linux/amd64,linux/arm64 --push -t hub.realmanual.ru/pub/sqlite-backup \
-        --build-arg DOCKER_BASEIMAGE=${DOCKER_BASEIMAGE} .
+if [ -z "$TAG" ]; then
+  TAG=latest
+fi
+
+docker buildx build --platform linux/amd64,linux/arm64 --push -t git.realmanual.ru/pub/sqlite-backup:${TAG} .

docker-compose.yml

@@ -1,6 +1,9 @@
 services:
   sqlite_backup:
-    image: hub.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,6 +1,17 @@
 #!/bin/sh
 
-echo "${CRONTAB} /scripts/backup.sh" > /etc/crontabs/root
+# Create crontab in a writable location and set proper permissions
+mkdir -p /tmp/crontabs
+echo "${CRONTAB:-"0 * * * *"} /scripts/backup.sh >> /proc/1/fd/1 2>&1" > /tmp/crontabs/root
+chmod 644 /tmp/crontabs/root
 
-/scripts/backup.sh
-exec crond -f
+# Run initial backup
+# /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

@@ -1,6 +1,21 @@
 #!/bin/bash
 
-rclone config create myminio s3 provider Minio access_key_id $MINIO_ACCOUNT_ID secret_access_key $MINIO_APPLICATION_KEY endpoint $MINIO_ENDPOINT region $MINIO_LOCATION acl private
+# Create rclone config on-the-fly in a writable location
+RCLONE_CONFIG_DIR="/tmp/rclone"
+mkdir -p "$RCLONE_CONFIG_DIR"
+export RCLONE_CONFIG="$RCLONE_CONFIG_DIR/rclone.conf"
+
+cat > "$RCLONE_CONFIG" << EOF
+[myminio]
+type = s3
+provider = Minio
+access_key_id = $MINIO_ACCOUNT_ID
+secret_access_key = $MINIO_APPLICATION_KEY
+endpoint = $MINIO_ENDPOINT
+region = $MINIO_LOCATION
+acl = private
+no_check_bucket = true
+EOF
 
 case $1 in
 	copy)
@@ -8,11 +23,11 @@ case $1 in
 		rclone copy --progress $2 $3
 	;;
 	list)
-		echo "list $2"
-		rclone ls $2
+		echo "list ${MINIO_PATH}/$2"
+		rclone ls ${MINIO_PATH}/$2
 	;;
 	delete)
-		echo "delete $2"
-		rclone delete $2
+		echo "delete ${MINIO_PATH}/$2"
+		rclone delete ${MINIO_PATH}/$2
 	;;
 esac