From 0a4d6e6311fdca9682314f01a39c3e8de73a4092 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Dec 2022 23:05:36 +0000
Subject: [PATCH 1/5] feat: bump rclone/rclone from 1.60.1 to 1.61.1

Bumps rclone/rclone from 1.60.1 to 1.61.1.

---
updated-dependencies:
- dependency-name: rclone/rclone
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8a9ccd9..53ee247 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 # for linux/amd64 platform
-FROM rclone/rclone:1.60.1 AS image-linux-amd64
+FROM rclone/rclone:1.61.1 AS image-linux-amd64
 
 
 # for linux/arm64 platform
-FROM rclone/rclone:1.60.1 AS image-linux-arm64
+FROM rclone/rclone:1.61.1 AS image-linux-arm64
 
 
 # for linux/arm/v7 platform
-FROM rclone/rclone:1.60.1 AS image-linux-armv7
+FROM rclone/rclone:1.61.1 AS image-linux-armv7
 
 
 # for linux/arm/v6 platform

From 588131e3759ebb13f2e842f3ffac3373b5cf6508 Mon Sep 17 00:00:00 2001
From: ttionya <git@ttionya.com>
Date: Sun, 25 Dec 2022 21:21:19 +0800
Subject: [PATCH 2/5] feat: update Dockerfile base image version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 53ee247..6cc3633 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ FROM alpine:3.15 AS image-linux-armv6
 
 RUN apk add --no-cache ca-certificates fuse \
   && echo "user_allow_other" >> /etc/fuse.conf \
-  && wget https://downloads.rclone.org/v1.60.1/rclone-v1.60.1-linux-arm.zip -O /rclone-linux-arm.zip \
+  && wget https://downloads.rclone.org/v1.61.1/rclone-v1.61.1-linux-arm.zip -O /rclone-linux-arm.zip \
   && unzip /rclone-linux-arm.zip -j -d /rclone-linux-arm \
   && cp /rclone-linux-arm/rclone /usr/local/bin/ \
   && rm -rf /rclone-linux-arm.zip /rclone-linux-arm \

From a33596c9aac7a474bceeabc7e6f08cd87a38dc60 Mon Sep 17 00:00:00 2001
From: ttionya <git@ttionya.com>
Date: Sun, 25 Dec 2022 21:32:33 +0800
Subject: [PATCH 3/5] feat: replace p7zip with 7zip package

---
 Dockerfile | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6cc3633..d655a6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,4 @@
-# for linux/amd64 platform
-FROM rclone/rclone:1.61.1 AS image-linux-amd64
-
-
-# for linux/arm64 platform
-FROM rclone/rclone:1.61.1 AS image-linux-arm64
-
-
-# for linux/arm/v7 platform
-FROM rclone/rclone:1.61.1 AS image-linux-armv7
-
-
-# for linux/arm/v6 platform
-FROM alpine:3.15 AS image-linux-armv6
-
-RUN apk add --no-cache ca-certificates fuse \
-  && echo "user_allow_other" >> /etc/fuse.conf \
-  && wget https://downloads.rclone.org/v1.61.1/rclone-v1.61.1-linux-arm.zip -O /rclone-linux-arm.zip \
-  && unzip /rclone-linux-arm.zip -j -d /rclone-linux-arm \
-  && cp /rclone-linux-arm/rclone /usr/local/bin/ \
-  && rm -rf /rclone-linux-arm.zip /rclone-linux-arm \
-  && rclone --help
-
-ENV XDG_CONFIG_HOME="/config"
-
-
-# main
-FROM image-${TARGETOS}-${TARGETARCH}${TARGETVARIANT}
+FROM rclone/rclone:1.61.1
 
 LABEL "repository"="https://github.com/ttionya/vaultwarden-backup" \
   "homepage"="https://github.com/ttionya/vaultwarden-backup" \
@@ -40,7 +13,7 @@ COPY scripts/*.sh /app/
 
 RUN chmod +x /app/*.sh \
   && mkdir -m 777 /bitwarden \
-  && apk add --no-cache bash heirloom-mailx p7zip sqlite supercronic tzdata \
+  && apk add --no-cache 7zip bash heirloom-mailx sqlite supercronic tzdata \
   && ln -sf "${LOCALTIME_FILE}" /etc/localtime \
   && addgroup -g "${USER_ID}" "${USER_NAME}" \
   && adduser -u "${USER_ID}" -Ds /bin/sh -G "${USER_NAME}" "${USER_NAME}"

From f0e1ae9523793403360069e490ef84612b49b595 Mon Sep 17 00:00:00 2001
From: ttionya <git@ttionya.com>
Date: Sun, 25 Dec 2022 21:34:27 +0800
Subject: [PATCH 4/5] release: release v1.15.3-beta.0

---
 version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version b/version
index c2c536e..21f14a9 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v1.15.2
+v1.15.3-beta.0

From aaccf0bb16388abe44d89a2a31278c24606d9fdc Mon Sep 17 00:00:00 2001
From: ttionya <git@ttionya.com>
Date: Sun, 25 Dec 2022 21:58:13 +0800
Subject: [PATCH 5/5] release: release v1.15.3

---
 CHANGELOG.md | 11 +++++++++++
 version      |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cba6aff..d33fd13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.15.3 (20221225)
+
+### Feature
+
+- Update Dockerfile base image to `rclone/rclone:1.61.1`
+- Replace `p7zip` with `7zip` package (close [#86](https://github.com/ttionya/vaultwarden-backup/issues/68))
+
+<br>
+
+
+
 ## v1.15.2 (20221119)
 
 ### Feature
diff --git a/version b/version
index 21f14a9..7f37c35 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v1.15.3-beta.0
+v1.15.3