From cc007e6c9266d4d0dee0e523125413e1ac5d3354 Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 22:14:02 +1000 Subject: [PATCH 01/15] Update README.md fix dates --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 443ce91..4029922 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ A user of SBFspot software acknowledges that he or she is receiving this softwar SMA, Speedwire are registered trademarks of [SMA Solar Technology AG](http://www.sma.de/en/company/about-sma.html) -[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20testing-red.svg -[release-shield]: https://img.shields.io/badge/version-2023.repo-blue.svg -[release]: https://github.com/hassio-addons/addon-ssh/tree/2023.repo +[release-shield]: https://img.shields.io/badge/version-2024.repo-blue.svg +[release]: https://github.com/hassio-addons/addon-ssh/tree/2024.repo From e735d6d9f8e983aa3b13c1fc51e421417e4db085 Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 22:15:10 +1000 Subject: [PATCH 02/15] Update README.md fix maint date --- haos-sbfspot/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haos-sbfspot/README.md b/haos-sbfspot/README.md index be04d51..7bf5589 100644 --- a/haos-sbfspot/README.md +++ b/haos-sbfspot/README.md @@ -8,7 +8,7 @@ ![Project Maintenance][maintenance-shield] [![CI](https://github.com/habuild/hassio-addons/actions/workflows/addon-ci.yaml/badge.svg)](https://github.com/habuild/hassio-addons/actions/workflows/addon-ci.yaml) [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg -[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg [![Open your Home Assistant instance and show the add add-on repository dialog with a specific repository URL pre-filled.](https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Fhabuild%2Fhassio-addons) From 22ef3dc5a0d156fa2833fceff04eae33d6bc26d9 Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 22:15:37 +1000 Subject: [PATCH 03/15] Update DOCS.md fix maint date --- haos-sbfspot/DOCS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haos-sbfspot/DOCS.md b/haos-sbfspot/DOCS.md index be04d51..7bf5589 100644 --- a/haos-sbfspot/DOCS.md +++ b/haos-sbfspot/DOCS.md @@ -8,7 +8,7 @@ ![Project Maintenance][maintenance-shield] [![CI](https://github.com/habuild/hassio-addons/actions/workflows/addon-ci.yaml/badge.svg)](https://github.com/habuild/hassio-addons/actions/workflows/addon-ci.yaml) [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg -[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg [![Open your Home Assistant instance and show the add add-on repository dialog with a specific repository URL pre-filled.](https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Fhabuild%2Fhassio-addons) From be4028ea9bf8f5a602c5cb0741b1e5bbfb66b221 Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 22:19:29 +1000 Subject: [PATCH 04/15] Update CHANGELOG.md update 2024.5.1 --- haos-sbfspot/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/haos-sbfspot/CHANGELOG.md b/haos-sbfspot/CHANGELOG.md index b47f93b..bdf1368 100644 --- a/haos-sbfspot/CHANGELOG.md +++ b/haos-sbfspot/CHANGELOG.md @@ -2,6 +2,13 @@ # ![Version](https://img.shields.io/badge/dynamic/yaml?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Fhabuild%2Fhassio-addons%2Fmain%2Fhaos-sbfspot%2Fconfig.yaml) +- Bump SPBspot to latest. +- Bump dependencies + +## ![Release][release-shield-2023-7-1] + +[release-shield-2023-7-1]: https://img.shields.io/badge/version-2023.7.1-blue.svg + - Added network to apparmor capabilities for DEB12 supervised installs - issue75 - Added 14 day archive to daily archive function - bump dependencies From 61424ec924a81284c507ffc7364f30551965a4a5 Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 22:24:10 +1000 Subject: [PATCH 05/15] Update Dockerfile bump dependencies --- haos-sbfspot/Dockerfile | 42 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/haos-sbfspot/Dockerfile b/haos-sbfspot/Dockerfile index 862d77b..5bdc593 100644 --- a/haos-sbfspot/Dockerfile +++ b/haos-sbfspot/Dockerfile @@ -15,18 +15,17 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # install requirements RUN apk update && apk add --no-cache \ - bluez=5.66-r5 \ - bluez-dev=5.66-r5 \ - boost-dev=1.82.0-r1 \ - # split version in pkgs manager - curl-dev \ - git=2.40.1-r0 \ - g++=12.2.1_git20220924-r10 \ - make=4.4.1-r1 \ - mariadb-dev=10.11.4-r0\ - mosquitto-clients=2.0.15-r3 \ - nginx=1.24.0-r6 \ - tzdata=2023c-r1 + bluez=5.76-r0 \ + bluez-dev=5.76-r0 \ + boost-dev=1.82.0-r5 \ + curl-dev=8.7.1-r0 \ + git=2.45.1-r0 \ + g++=13.2.1_git20240309-r0 \ + make=4.4.1-r2 \ + mariadb-dev=10.11.8-r0\ + mosquitto-clients=2.0.18-r0 \ + nginx=1.26.0-r1 \ + tzdata=2024a-r1 # download and build SBFspot WORKDIR /tmp @@ -50,17 +49,16 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN apk update && apk add --no-cache \ - bluez=5.66-r5 \ + bluez=5.76-r0 \ nano=7.2-r1 \ - bluez-libs=5.66-r5 \ - libstdc++=12.2.1_git20220924-r10 \ - mariadb-common=10.11.4-r0 \ - mariadb-connector-c=3.3.5-r0 \ - ncurses-libs=6.4_p20230506-r0 \ - # split version in pkgs manager - libcurl \ - mosquitto-clients=2.0.15-r3 \ - nginx=1.24.0-r6 + bluez-libs=5.76-r0 \ + libstdc++=13.2.1_git20240309-r0 \ + mariadb-common=10.11.8-r0 \ + mariadb-connector-c=3.3.10-r0 \ + ncurses-libs=6.4_p20240420-r0 \ + libcurl=8.7.1-r0 \ + mosquitto-clients=2.0.18-r0 \ + nginx=1.26.0-r1 #tzdata=2023c-r1 #boost-date_time1.78 From f405c736442e1cbf77a80ed96c8978f12e06c856 Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 22:25:21 +1000 Subject: [PATCH 06/15] Update config.yaml version number --- haos-sbfspot/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haos-sbfspot/config.yaml b/haos-sbfspot/config.yaml index e77163d..675dd07 100644 --- a/haos-sbfspot/config.yaml +++ b/haos-sbfspot/config.yaml @@ -1,6 +1,6 @@ --- name: HAOS-SBFspot -version: 2023.7.1 +version: 2024.5.1 slug: haos-sbfspot description: Manage SBFspot with a simple interface url: "https://github.com/habuild/hassio-addons/tree/main/haos-sbfspot" @@ -24,7 +24,7 @@ services: - mqtt:want options: Connection_Type: "Bluetooth" - Sensors_HA: No + Sensors_HA: "No" BTAddress: "!secret BTAddress" Password: "!secret SBFpassword" LocalBTAddress: "!secret LocalBTAddress" From cdeb78ec2ae9a295e35fe93b7cd61ee19b40123c Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 22:41:54 +1000 Subject: [PATCH 07/15] Update build.yaml bump base image build --- haos-sbfspot/build.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/haos-sbfspot/build.yaml b/haos-sbfspot/build.yaml index 242ca0d..7851f8c 100644 --- a/haos-sbfspot/build.yaml +++ b/haos-sbfspot/build.yaml @@ -1,11 +1,11 @@ --- # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile build_from: - aarch64: "ghcr.io/home-assistant/aarch64-base:3.18" - armhf: "ghcr.io/home-assistant/armhf-base:3.18" - armv7: "ghcr.io/home-assistant/armv7-base:3.18" - amd64: "ghcr.io/home-assistant/amd64-base:3.18" - # i386: "ghcr.io/home-assistant/i386-base:3.18" + aarch64: "ghcr.io/home-assistant/aarch64-base:3.19" + armhf: "ghcr.io/home-assistant/armhf-base:3.19" + armv7: "ghcr.io/home-assistant/armv7-base:3.19" + amd64: "ghcr.io/home-assistant/amd64-base:3.19" + # i386: "ghcr.io/home-assistant/i386-base:3.19" labels: org.opencontainers.image.title: "SBFspot for Home Assistant" From e6900e33d09531d20a15626d38f6a0c3bce96610 Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 22:47:57 +1000 Subject: [PATCH 08/15] Update CHANGELOG.md --- haos-sbfspot/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/haos-sbfspot/CHANGELOG.md b/haos-sbfspot/CHANGELOG.md index bdf1368..f12272c 100644 --- a/haos-sbfspot/CHANGELOG.md +++ b/haos-sbfspot/CHANGELOG.md @@ -3,6 +3,7 @@ # ![Version](https://img.shields.io/badge/dynamic/yaml?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Fhabuild%2Fhassio-addons%2Fmain%2Fhaos-sbfspot%2Fconfig.yaml) - Bump SPBspot to latest. +- Bump base images to 3.19 - Bump dependencies ## ![Release][release-shield-2023-7-1] From 3b4ee4266a9948b9a41933d699d25ae78b63c7d0 Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 23:00:21 +1000 Subject: [PATCH 09/15] Update build.yaml updates builds to 3.20 --- haos-sbfspot/build.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/haos-sbfspot/build.yaml b/haos-sbfspot/build.yaml index 7851f8c..8b0ae8c 100644 --- a/haos-sbfspot/build.yaml +++ b/haos-sbfspot/build.yaml @@ -1,11 +1,11 @@ --- # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile build_from: - aarch64: "ghcr.io/home-assistant/aarch64-base:3.19" - armhf: "ghcr.io/home-assistant/armhf-base:3.19" - armv7: "ghcr.io/home-assistant/armv7-base:3.19" - amd64: "ghcr.io/home-assistant/amd64-base:3.19" - # i386: "ghcr.io/home-assistant/i386-base:3.19" + aarch64: "ghcr.io/home-assistant/aarch64-base:3.20" + armhf: "ghcr.io/home-assistant/armhf-base:3.20" + armv7: "ghcr.io/home-assistant/armv7-base:3.20" + amd64: "ghcr.io/home-assistant/amd64-base:3.20" + # i386: "ghcr.io/home-assistant/i386-base:3.16" labels: org.opencontainers.image.title: "SBFspot for Home Assistant" From 976e717915ed7c46371f22d1c4d57e3ab546f99c Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 23:00:46 +1000 Subject: [PATCH 10/15] Update CHANGELOG.md bump base image to 3.20 --- haos-sbfspot/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haos-sbfspot/CHANGELOG.md b/haos-sbfspot/CHANGELOG.md index f12272c..00f6518 100644 --- a/haos-sbfspot/CHANGELOG.md +++ b/haos-sbfspot/CHANGELOG.md @@ -3,7 +3,7 @@ # ![Version](https://img.shields.io/badge/dynamic/yaml?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Fhabuild%2Fhassio-addons%2Fmain%2Fhaos-sbfspot%2Fconfig.yaml) - Bump SPBspot to latest. -- Bump base images to 3.19 +- Bump base images to 3.20 - Bump dependencies ## ![Release][release-shield-2023-7-1] From 79ca6f30e03fcac7de9e1be959b628f394093755 Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 23:42:37 +1000 Subject: [PATCH 11/15] Update CHANGELOG.md 3.20 wasn't available as yet --- haos-sbfspot/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haos-sbfspot/CHANGELOG.md b/haos-sbfspot/CHANGELOG.md index 00f6518..f12272c 100644 --- a/haos-sbfspot/CHANGELOG.md +++ b/haos-sbfspot/CHANGELOG.md @@ -3,7 +3,7 @@ # ![Version](https://img.shields.io/badge/dynamic/yaml?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Fhabuild%2Fhassio-addons%2Fmain%2Fhaos-sbfspot%2Fconfig.yaml) - Bump SPBspot to latest. -- Bump base images to 3.20 +- Bump base images to 3.19 - Bump dependencies ## ![Release][release-shield-2023-7-1] From ef183a9e4f02b3029d0cb95921b9c44267d47cca Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 23:43:03 +1000 Subject: [PATCH 12/15] Update build.yaml --- haos-sbfspot/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/haos-sbfspot/build.yaml b/haos-sbfspot/build.yaml index 8b0ae8c..b1d099d 100644 --- a/haos-sbfspot/build.yaml +++ b/haos-sbfspot/build.yaml @@ -1,10 +1,10 @@ --- # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile build_from: - aarch64: "ghcr.io/home-assistant/aarch64-base:3.20" - armhf: "ghcr.io/home-assistant/armhf-base:3.20" - armv7: "ghcr.io/home-assistant/armv7-base:3.20" - amd64: "ghcr.io/home-assistant/amd64-base:3.20" + aarch64: "ghcr.io/home-assistant/aarch64-base:3.19" + armhf: "ghcr.io/home-assistant/armhf-base:3.19" + armv7: "ghcr.io/home-assistant/armv7-base:3.19" + amd64: "ghcr.io/home-assistant/amd64-base:3.19" # i386: "ghcr.io/home-assistant/i386-base:3.16" labels: From 7ca3eaed40b098edf4718b30311316e2cd375bdf Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Thu, 23 May 2024 23:44:39 +1000 Subject: [PATCH 13/15] Update Dockerfile --- haos-sbfspot/Dockerfile | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/haos-sbfspot/Dockerfile b/haos-sbfspot/Dockerfile index 5bdc593..f0552f3 100644 --- a/haos-sbfspot/Dockerfile +++ b/haos-sbfspot/Dockerfile @@ -15,17 +15,17 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # install requirements RUN apk update && apk add --no-cache \ - bluez=5.76-r0 \ - bluez-dev=5.76-r0 \ - boost-dev=1.82.0-r5 \ - curl-dev=8.7.1-r0 \ - git=2.45.1-r0 \ - g++=13.2.1_git20240309-r0 \ + bluez=5.70-r0 \ + bluez-dev=5.70-r0 \ + boost-dev=1.82.0-r3 \ + curl-dev=8.5.0-r0 \ + git=2.43.4-r0 \ + g++=13.2.1_git20231014-r0 \ make=4.4.1-r2 \ - mariadb-dev=10.11.8-r0\ + mariadb-dev=10.11.6-r0\ mosquitto-clients=2.0.18-r0 \ - nginx=1.26.0-r1 \ - tzdata=2024a-r1 + nginx=1.24.0-r16 \ + tzdata=2024a-r0 # download and build SBFspot WORKDIR /tmp @@ -49,16 +49,16 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN apk update && apk add --no-cache \ - bluez=5.76-r0 \ + bluez=5.70-r0 \ + bluez-libs=5.70-r0 \ nano=7.2-r1 \ - bluez-libs=5.76-r0 \ - libstdc++=13.2.1_git20240309-r0 \ - mariadb-common=10.11.8-r0 \ - mariadb-connector-c=3.3.10-r0 \ - ncurses-libs=6.4_p20240420-r0 \ - libcurl=8.7.1-r0 \ + libstdc++=13.2.1_git20231014-r0 \ + mariadb-common=10.11.6-r0 \ + mariadb-connector-c=3.3.8-r0 \ + ncurses-libs=6.4_p20231125-r0 \ + libcurl=8.5.0-r0 \ mosquitto-clients=2.0.18-r0 \ - nginx=1.26.0-r1 + nginx=1.24.0-r16 #tzdata=2023c-r1 #boost-date_time1.78 From 040911cf7395a4050a0b3430ba9b3a11cab8ded3 Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Fri, 24 May 2024 00:48:34 +1000 Subject: [PATCH 14/15] Update CHANGELOG.md --- haos-sbfspot/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/haos-sbfspot/CHANGELOG.md b/haos-sbfspot/CHANGELOG.md index f12272c..202dd08 100644 --- a/haos-sbfspot/CHANGELOG.md +++ b/haos-sbfspot/CHANGELOG.md @@ -2,7 +2,8 @@ # ![Version](https://img.shields.io/badge/dynamic/yaml?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Fhabuild%2Fhassio-addons%2Fmain%2Fhaos-sbfspot%2Fconfig.yaml) -- Bump SPBspot to latest. +- Bump SPBspot to latest. Which is technically 3.9.9 due to SBFspot github setup. +- https://github.com/SBFspot/SBFspot/blob/master/SBFspot/version.h - Bump base images to 3.19 - Bump dependencies From 37e03dc6546a7ff927e2df880587ccdf30bdf4ff Mon Sep 17 00:00:00 2001 From: habuild <36288425+habuild@users.noreply.github.com> Date: Fri, 24 May 2024 00:54:02 +1000 Subject: [PATCH 15/15] Update CHANGELOG.md --- haos-sbfspot/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haos-sbfspot/CHANGELOG.md b/haos-sbfspot/CHANGELOG.md index 202dd08..d257b85 100644 --- a/haos-sbfspot/CHANGELOG.md +++ b/haos-sbfspot/CHANGELOG.md @@ -2,7 +2,7 @@ # ![Version](https://img.shields.io/badge/dynamic/yaml?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Fhabuild%2Fhassio-addons%2Fmain%2Fhaos-sbfspot%2Fconfig.yaml) -- Bump SPBspot to latest. Which is technically 3.9.9 due to SBFspot github setup. +- Bump SPBspot to latest. Which is technically 3.9.9 due to SBFspot github setup. - https://github.com/SBFspot/SBFspot/blob/master/SBFspot/version.h - Bump base images to 3.19 - Bump dependencies