From 6c111b009c1d82a4ead0a6f298731e7c226801a6 Mon Sep 17 00:00:00 2001 From: ttionya Date: Tue, 24 May 2022 00:49:45 +0800 Subject: [PATCH 1/6] feat: build image from alpine for arm/v6 --- Dockerfile.alpine | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Dockerfile.alpine diff --git a/Dockerfile.alpine b/Dockerfile.alpine new file mode 100644 index 0000000..9c0cb7c --- /dev/null +++ b/Dockerfile.alpine @@ -0,0 +1,17 @@ +FROM alpine:latest + +# See Rclone Dockerfile +# https://github.com/rclone/rclone/blob/master/Dockerfile + +LABEL "repository"="https://github.com/ttionya/vaultwarden-backup" \ + "homepage"="https://github.com/ttionya/vaultwarden-backup" \ + "maintainer"="ttionya " + +COPY scripts/*.sh /app/ + +RUN chmod +x /app/*.sh \ + && apk add --no-cache bash ca-certificates curl sqlite p7zip heirloom-mailx tzdata unzip \ + && curl https://rclone.org/install.sh | bash \ + && apk del curl unzip + +ENTRYPOINT ["/app/entrypoint.sh"] From d12dfedb6aa4cf4b85f71d9c0eb90ace7555d36b Mon Sep 17 00:00:00 2001 From: ttionya Date: Tue, 24 May 2022 01:10:08 +0800 Subject: [PATCH 2/6] chore: build arm/v6 image when beta --- .github/workflows/docker-publish-beta.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/docker-publish-beta.yml b/.github/workflows/docker-publish-beta.yml index 3860693..e113155 100644 --- a/.github/workflows/docker-publish-beta.yml +++ b/.github/workflows/docker-publish-beta.yml @@ -40,3 +40,14 @@ jobs: tags: | ttionya/vaultwarden-backup:${{ steps.pre.outputs.tag }} ttionya/bitwardenrs-backup:${{ steps.pre.outputs.tag }} + - + name: Build and push (for arm/v6) + uses: docker/build-push-action@v2 + with: + context: '.' + file: './Dockerfile.alpine' + platforms: 'linux/arm/v6' + push: true + tags: | + ttionya/vaultwarden-backup:${{ steps.pre.outputs.tag }} + ttionya/bitwardenrs-backup:${{ steps.pre.outputs.tag }} From 20af68075c5544d15acf63d0b9266b8074cb88d2 Mon Sep 17 00:00:00 2001 From: ttionya Date: Tue, 24 May 2022 01:12:19 +0800 Subject: [PATCH 3/6] release: release v1.11.2-beta.0 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 65b4811..90238c3 100644 --- a/version +++ b/version @@ -1 +1 @@ -v1.11.1 +v1.11.2-beta.0 From 077c307c18f8713275da47ccda06914e73b89315 Mon Sep 17 00:00:00 2001 From: ttionya Date: Fri, 1 Jul 2022 00:47:38 +0800 Subject: [PATCH 4/6] chore: no longer build arm/v6 image when beta --- .github/workflows/docker-publish-beta.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/docker-publish-beta.yml b/.github/workflows/docker-publish-beta.yml index e113155..3860693 100644 --- a/.github/workflows/docker-publish-beta.yml +++ b/.github/workflows/docker-publish-beta.yml @@ -40,14 +40,3 @@ jobs: tags: | ttionya/vaultwarden-backup:${{ steps.pre.outputs.tag }} ttionya/bitwardenrs-backup:${{ steps.pre.outputs.tag }} - - - name: Build and push (for arm/v6) - uses: docker/build-push-action@v2 - with: - context: '.' - file: './Dockerfile.alpine' - platforms: 'linux/arm/v6' - push: true - tags: | - ttionya/vaultwarden-backup:${{ steps.pre.outputs.tag }} - ttionya/bitwardenrs-backup:${{ steps.pre.outputs.tag }} From 5032bd3ff9084cc754fea2e694f4284eef9be52f Mon Sep 17 00:00:00 2001 From: ttionya Date: Fri, 1 Jul 2022 20:42:59 +0800 Subject: [PATCH 5/6] chore: don't push any beta version to deprecated repository --- .github/workflows/docker-publish-beta.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-publish-beta.yml b/.github/workflows/docker-publish-beta.yml index 3860693..2a38426 100644 --- a/.github/workflows/docker-publish-beta.yml +++ b/.github/workflows/docker-publish-beta.yml @@ -39,4 +39,3 @@ jobs: push: true tags: | ttionya/vaultwarden-backup:${{ steps.pre.outputs.tag }} - ttionya/bitwardenrs-backup:${{ steps.pre.outputs.tag }} From 2970c6022b7c751af1fb514564d916d492535248 Mon Sep 17 00:00:00 2001 From: ttionya Date: Fri, 1 Jul 2022 21:38:05 +0800 Subject: [PATCH 6/6] Revert "feat: build image from alpine for arm/v6" This reverts commit 6c111b009c1d82a4ead0a6f298731e7c226801a6. --- Dockerfile.alpine | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Dockerfile.alpine diff --git a/Dockerfile.alpine b/Dockerfile.alpine deleted file mode 100644 index 9c0cb7c..0000000 --- a/Dockerfile.alpine +++ /dev/null @@ -1,17 +0,0 @@ -FROM alpine:latest - -# See Rclone Dockerfile -# https://github.com/rclone/rclone/blob/master/Dockerfile - -LABEL "repository"="https://github.com/ttionya/vaultwarden-backup" \ - "homepage"="https://github.com/ttionya/vaultwarden-backup" \ - "maintainer"="ttionya " - -COPY scripts/*.sh /app/ - -RUN chmod +x /app/*.sh \ - && apk add --no-cache bash ca-certificates curl sqlite p7zip heirloom-mailx tzdata unzip \ - && curl https://rclone.org/install.sh | bash \ - && apk del curl unzip - -ENTRYPOINT ["/app/entrypoint.sh"]