Обновлен образ для сервиса sqlite_backup в README.md и изменена конфигурация rclone для работы с Minio в скрипте minio_uploader.sh.

.gitea/workflows/docker-build.yml

@@ -11,51 +11,29 @@ permissions:
 
 jobs:
   build:
-    runs-on: docker
+    name: Build image
+    runs-on: ubuntu-22.04
+    container: catthehacker/ubuntu:act-latest
     env:
-      REGISTRY: hub.realmanual.ru
+      REGISTRY: git.realmanual.ru
-      IMAGE_NAME: pub/sqlite-backup/backup
+      IMAGE_NAME: ${{ gitea.repository }}
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
-      - name: Ensure tag commit is reachable from main
+      - name: Log in to the Container registry
-        shell: bash
-        run: |
-          set -euo pipefail
-          git fetch --no-tags --depth=0 origin main
-          if git merge-base --is-ancestor "$GITHUB_SHA" origin/main; then
-            echo "Commit is on main history. Proceeding."
-          else
-            echo "Tag commit is not from main. Skipping build." >&2
-            exit 0
-          fi
-
-      - name: Extract tag
-        id: vars
-        shell: bash
-        run: |
-          TAG_REF="${GITHUB_REF#refs/tags/}"
-          echo "tag=$TAG_REF" >> "$GITHUB_OUTPUT"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          username: ${{ gitea.actor }}
-          password: ${{ secrets.GITEA_TOKEN }}
+          password: ${{ secrets.PUSH_TOKEN }}
 
-      - name: Build and push
+      - name: Build and push Docker image
+        id: push
         uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          platforms: linux/amd64
           tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.vars.outputs.tag }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ gitea.ref_name }}
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

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:

scripts/minio_uploader.sh

@@ -1,18 +1,32 @@
 #!/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
+EOF
 
 case $1 in
 	copy)
 		echo "copy from $2 to $3"
-		rclone copy --progress $2 $3
+		rclone copy --progress $2 myminio:$3
 	;;
 	list)
 		echo "list $2"
-		rclone ls $2
+		rclone ls myminio:$2
 	;;
 	delete)
 		echo "delete $2"
-		rclone delete $2
+		rclone delete myminio:$2
 	;;
 esac