From 6c2453bd0ea20fee87ebd0e6bb70b5dd3eb7b4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20P=C3=B6schl?= Date: Fri, 13 Oct 2023 14:21:54 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=E2=9C=A8=20More=20devices=20and=20alpine?= =?UTF-8?q?=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rsync-local/CHANGELOG.md | 9 +++++++++ rsync-local/DOCS.md | 6 +++--- rsync-local/build.yaml | 10 +++++----- rsync-local/config.yaml | 25 +++++++++++++++++++++++-- rsync-local/root/run.sh | 2 +- 5 files changed, 41 insertions(+), 11 deletions(-) diff --git a/rsync-local/CHANGELOG.md b/rsync-local/CHANGELOG.md index b48d0f11..8f41f3be 100644 --- a/rsync-local/CHANGELOG.md +++ b/rsync-local/CHANGELOG.md @@ -1,3 +1,12 @@ +## 1.7.0 - 2023-10-13 + +* 🔨 Correct --archive argument (thanks @reedy | #418) +* 🔼 Updated to alpine `3.18` +* 🔼 Updated rsync to `3.2.7-r4` +* 🔼 Update coreutils to `9.3-r1` +* 🔼 Update openssh-client-default to `9.3_p2-r0` +* ✨ Add more device mappings (`/dev/sd[a-e][1-5]`) + ## 1.6.0 - 2023-01-08 * 🔼 Updated rsync to `3.2.7-r0` diff --git a/rsync-local/DOCS.md b/rsync-local/DOCS.md index 1e90f409..c5762b65 100644 --- a/rsync-local/DOCS.md +++ b/rsync-local/DOCS.md @@ -11,7 +11,7 @@ Example config: folders: - source: /config - source: /media/playlists - options: '-archive --recursive --compress' + options: '--archive --recursive --compress' external_folder: backup external_device: '' ``` @@ -26,7 +26,7 @@ The source folder for rsync. ### `folders` - `options` (optional) -Use your own options for rsync. This string is replacing the default one and get directly to rsync. The default is `-archive --recursive --compress --delete --prune-empty-dirs`. +Use your own options for rsync. This string is replacing the default one and get directly to rsync. The default is `--archive --recursive --compress --delete --prune-empty-dirs`. ### `external_folder` @@ -40,4 +40,4 @@ Make sure to adjust it when for example running Home Assistant from a external d If no device is specified all available devices will be displayed in the log. No sync takes place without device. -Available options: `/dev/sda1`, `/dev/sda2`, `/dev/sdb1`, `/dev/sdb2` +Available options: `/dev/sd[a-e][1-5]` diff --git a/rsync-local/build.yaml b/rsync-local/build.yaml index 05f1b7df..91932faa 100644 --- a/rsync-local/build.yaml +++ b/rsync-local/build.yaml @@ -1,6 +1,6 @@ build_from: - armhf: ghcr.io/home-assistant/armhf-base:3.16 - armv7: ghcr.io/home-assistant/armv7-base:3.16 - aarch64: ghcr.io/home-assistant/aarch64-base:3.16 - amd64: ghcr.io/home-assistant/amd64-base:3.16 - i386: ghcr.io/home-assistant/i386-base:3.16 + armhf: ghcr.io/home-assistant/armhf-base:3.18 + armv7: ghcr.io/home-assistant/armv7-base:3.18 + aarch64: ghcr.io/home-assistant/aarch64-base:3.18 + amd64: ghcr.io/home-assistant/amd64-base:3.18 + i386: ghcr.io/home-assistant/i386-base:3.18 diff --git a/rsync-local/config.yaml b/rsync-local/config.yaml index f29d3196..701651e7 100644 --- a/rsync-local/config.yaml +++ b/rsync-local/config.yaml @@ -1,5 +1,5 @@ name: rsync local -version: 1.6.0 +version: 1.7.0 slug: rsync-local description: Sync folders to a external usb drive with rsync. url: https://github.com/Poeschl/Hassio-Addons/tree/main/rsync-local @@ -25,8 +25,29 @@ map: devices: - /dev/sda1 - /dev/sda2 + - /dev/sda3 + - /dev/sda4 + - /dev/sda5 - /dev/sdb1 - /dev/sdb2 + - /dev/sdb3 + - /dev/sdb4 + - /dev/sdb5 + - /dev/sdc1 + - /dev/sdc2 + - /dev/sdc3 + - /dev/sdc4 + - /dev/sdc5 + - /dev/sdd1 + - /dev/sdd2 + - /dev/sdd3 + - /dev/sdd4 + - /dev/sdd5 + - /dev/sde1 + - /dev/sde2 + - /dev/sde3 + - /dev/sde4 + - /dev/sde5 privileged: - SYS_ADMIN apparmor: false @@ -35,7 +56,7 @@ schema: - source: str options: str? external_folder: match(^[^/].+) - external_device: match(^(/dev/sd[a|b][1|2])?) + external_device: match(^(/dev/sd[a|b|c|d|e][1|2|3|4|5])?) options: folders: - source: /config diff --git a/rsync-local/root/run.sh b/rsync-local/root/run.sh index c8331ae8..d073c2f4 100644 --- a/rsync-local/root/run.sh +++ b/rsync-local/root/run.sh @@ -26,7 +26,7 @@ else for (( i=0; i ${EXTERNAL_DEVICE}/${EXTERNAL_FOLDER} with options \"${options}\"" set -x # shellcheck disable=SC2086 From 43a1f87d1c0a8ca1d1a00dd96843c9a0d94c6b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20P=C3=B6schl?= Date: Fri, 13 Oct 2023 14:24:22 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Add=20hacktoberfest?= =?UTF-8?q?-accepted=20label?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/labels.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/labels.yaml b/.github/labels.yaml index 54623b38..2e01cfe1 100644 --- a/.github/labels.yaml +++ b/.github/labels.yaml @@ -21,6 +21,9 @@ - color: '072540' name: hacktoberfest description: Not too heavy to lift. A nice thing for newcommers. +- color: '072540' + name: hacktoberfest-accepted + description: This PR will count towards your hacktoberfest score, even if not merged. - color: ffffff name: stale description: No interactions for quite some time From bda77b38265a73fde22ef483bfed9b8f07002d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20P=C3=B6schl?= Date: Fri, 13 Oct 2023 14:25:24 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=93=9D=20Make=20the=20dev=20branch=20?= =?UTF-8?q?clear=20for=20new=20contributions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fbb12e4c..b32d2005 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ ## How to contribute 1. Fork this repository and make your changes on your fork an a branch you like (I recommend to create a branch per feature). -2. Create a PR which targets the dev branch. +2. Create a PR which targets the `dev` branch. 3. After reviewed it your changes will live in the dev branch until all changes are pushed to the main branch. (Usually this is not long) ## Requirements to get Pull Requests accepted From e8cb9afdd69892206f3c0d8b9681b3cc1c73707a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20P=C3=B6schl?= Date: Fri, 13 Oct 2023 14:30:23 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=90=9B=20Fix=20missed=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rsync-local/CHANGELOG.md | 1 - rsync-local/Dockerfile | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rsync-local/CHANGELOG.md b/rsync-local/CHANGELOG.md index 8f41f3be..7d19e2d0 100644 --- a/rsync-local/CHANGELOG.md +++ b/rsync-local/CHANGELOG.md @@ -4,7 +4,6 @@ * 🔼 Updated to alpine `3.18` * 🔼 Updated rsync to `3.2.7-r4` * 🔼 Update coreutils to `9.3-r1` -* 🔼 Update openssh-client-default to `9.3_p2-r0` * ✨ Add more device mappings (`/dev/sd[a-e][1-5]`) ## 1.6.0 - 2023-01-08 diff --git a/rsync-local/Dockerfile b/rsync-local/Dockerfile index 30579f50..319438a3 100644 --- a/rsync-local/Dockerfile +++ b/rsync-local/Dockerfile @@ -3,8 +3,8 @@ FROM $BUILD_FROM AS RUNNING RUN apk update && \ apk add --no-cache \ - 'rsync=3.2.7-r0' \ - 'coreutils=9.1-r0' + 'rsync=3.2.7-r4' \ + 'coreutils=9.3-r1' COPY root / RUN chmod a+x /run.sh