From 2b47398f958e3f3f7849d3338d82c2f421830a62 Mon Sep 17 00:00:00 2001 From: Vassiliy Yegorov Date: Sun, 31 Aug 2025 19:59:44 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20TAG?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B7=D0=B0=20=D0=B2=20=D1=81=D0=BA=D1=80?= =?UTF-8?q?=D0=B8=D0=BF=D1=82=D0=B5=20docker-build.sh=20=D0=B8=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D0=B0=20rclone=20=D0=B2=20minio=5Fuploader.s?= =?UTF-8?q?h=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=80=D0=BE=D0=BF=D1=83=D1=81?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2=D1=83?= =?UTF-8?q?=D1=8E=D1=89=D0=B8=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-build.sh | 9 ++++++--- scripts/minio_uploader.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker-build.sh b/docker-build.sh index 31363cd..525d389 100755 --- a/docker-build.sh +++ b/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} . diff --git a/scripts/minio_uploader.sh b/scripts/minio_uploader.sh index 3cdce46..cb929fd 100644 --- a/scripts/minio_uploader.sh +++ b/scripts/minio_uploader.sh @@ -19,7 +19,7 @@ EOF case $1 in copy) echo "copy from $2 to $3" - rclone copy --progress $2 myminio:$3 + rclone copy --progress --skip-existing $2 myminio:$3 ;; list) echo "list $2"